请示报告制度

src/main/java/com/ghsc/partybuild/controller/partyLife/MeetingController.java

@@ -11,7 +11,7 @@ import com.ghsc.partybuild.util.DateUtils;
 import com.ghsc.partybuild.util.ExcelHelper;
 import com.ghsc.partybuild.util.JsonMapper;
 import com.ghsc.partybuild.util.StringUtils;
-import com.ghsc.partybuild.vo.PartyLifeMeetingVo;
+import com.ghsc.partybuild.vo.partyLife.PartyLifeMeetingVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.format.annotation.DateTimeFormat;

src/main/java/com/ghsc/partybuild/controller/partyLife/ReportSystemController.java

@@ -0,0 +1,187 @@
+package com.ghsc.partybuild.controller.partyLife;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.ghsc.partybuild.controller.jsonmodel.RequsetData;
+import com.ghsc.partybuild.service.UserService;
+import com.ghsc.partybuild.service.partyLife.ReportSystemService;
+import com.ghsc.partybuild.util.DateUtils;
+import com.ghsc.partybuild.util.ExcelHelper;
+import com.ghsc.partybuild.util.JsonMapper;
+import com.ghsc.partybuild.vo.partyLife.ReportSystemVo;
+import com.github.pagehelper.PageInfo;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.xssf.usermodel.XSSFCellStyle;
+import org.apache.poi.xssf.usermodel.XSSFSheet;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.*;
+
+@Slf4j
+@RestController
+@RequestMapping(value = "/api/partylife/reportsystem")
+public class ReportSystemController {
+    @Autowired
+    private ReportSystemService reportSystemService;
+    @Autowired
+    private UserService userService;
+    @Autowired
+    private DateUtils dateUtils;
+    private static final String dateTimeFormat = "yyyy-MM-dd";
+
+    @ResponseBody
+    @GetMapping("/getList")
+    public RequsetData<PageInfo<ReportSystemVo>> getList(int pageindex, int pagesize, @RequestParam(required = false) String dzzdm, 
+                                                             @RequestParam(required = false) @DateTimeFormat(pattern = dateTimeFormat) Date startDate, 
+                                                             @RequestParam(required = false) @DateTimeFormat(pattern = dateTimeFormat) Date endDate,
+                                                             @RequestParam(required = false) String zt, @RequestParam(required = false) String dx,
+                                                             @RequestParam(required = false) String sx) {
+        RequsetData<PageInfo<ReportSystemVo>> result = new RequsetData<>();
+        result.setItem(reportSystemService.getList(pageindex, pagesize, null, dzzdm, startDate, endDate, zt, dx, sx));
+        return result;
+    }
+
+    @ResponseBody
+    @GetMapping("/get")
+    public RequsetData<ReportSystemVo> get(@RequestParam(required = false) String id) {
+        RequsetData<ReportSystemVo> res = new RequsetData<>();
+
+        ReportSystemVo model = reportSystemService.getReportSystemById(id);
+        if (model == null) {
+            model = new ReportSystemVo();
+            model.setId(UUID.randomUUID().toString());
+        }
+
+        res.setItem(model);
+        return res;
+    }
+
+    @ResponseBody
+    @PostMapping("/save")
+    public RequsetData<String> save(@RequestBody ReportSystemVo data) {
+        RequsetData<String> result = new RequsetData<String>();
+        int count = 0;
+        String message = "";
+
+        try {
+            count = reportSystemService.save(data, userService.getLoginUser().getUserid());
+        } catch (Exception e) {
+            e.printStackTrace();
+            message = e.toString();
+        }
+
+        if (count > 0) {
+            result.setSuccess(true);
+            result.setMsg("保存成功！");
+        } else {
+            result.setSuccess(false);
+            result.setMsg("保存失败！" + message);
+        }
+        return result;
+    }
+
+    @ResponseBody
+    @PostMapping("/delete")
+    public RequsetData<Integer> delete(@RequestBody Map<String, Object> reqMap) {
+        RequsetData<Integer> result = new RequsetData<>();
+        int count = 0;
+        String message = "";
+
+        try {
+            List<String> idList = JsonMapper.jsonToObject(reqMap.get("ids").toString(), new TypeReference<List<String>>() {
+            });
+            count = reportSystemService.delete(idList);
+        } catch (Exception e) {
+            e.printStackTrace();
+            message = e.toString();
+        }
+
+        if (count > 0) {
+            result.setItem(count);
+            result.setSuccess(true);
+            result.setMsg("删除成功！");
+        } else {
+            result.setSuccess(false);
+            result.setMsg("删除失败！" + message);
+        }
+        return result;
+    }
+
+    @RequestMapping(value = "/export", method = RequestMethod.GET)
+    public void exportLeaderTeam(HttpServletResponse response, @RequestParam(required = false) String dzzdm,
+                                 @RequestParam(required = false) @DateTimeFormat(pattern = dateTimeFormat) Date startDate,
+                                 @RequestParam(required = false) @DateTimeFormat(pattern = dateTimeFormat) Date endDate,
+                                 @RequestParam(required = false) String zt, @RequestParam(required = false) String dx,
+                                 @RequestParam(required = false) String sx) throws Exception {
+        /**查询数据**/
+        List<ReportSystemVo> dataList = reportSystemService.getList(1, 100000, null, dzzdm, startDate, endDate, zt, dx, sx).getList();
+
+        ExcelHelper excelHelper = new ExcelHelper();
+        ExcelHelper.ExcelData data = excelHelper.new ExcelData();
+
+        XSSFWorkbook wb = new XSSFWorkbook();
+        XSSFSheet sheet = wb.createSheet("请示报告制度");
+        sheet.setColumnWidth(1, 256 * 30);
+        sheet.setColumnWidth(2, 256 * 12);
+        sheet.setColumnWidth(3, 256 * 20);
+        sheet.setColumnWidth(4, 256 * 20);
+        sheet.setColumnWidth(5, 256 * 25);
+        sheet.setColumnWidth(6, 256 * 25);
+        sheet.setColumnWidth(7, 256 * 40);
+        sheet.setColumnWidth(9, 256 * 20);
+
+        try{
+
+            //列名
+            List<String> titles = new ArrayList();
+            titles.add("序号");
+            titles.add("所属党组织");
+            titles.add("请示时间");
+            titles.add("请示报告主体");
+            titles.add("请示报告对象");
+            titles.add("请示报告事项");
+            titles.add("请示报告方式");
+            titles.add("请示报告反馈情况");
+            titles.add("创建人");
+            titles.add("创建时间");
+            data.setTitles(titles);
+
+            //数据
+            List<List<Object>> rows = new ArrayList();
+            List<List<XSSFCellStyle>> cellStyles = new ArrayList();
+            XSSFCellStyle defaultStyle = excelHelper.setDefaultBorder(wb);
+
+            int i = 0;
+            for (ReportSystemVo item : dataList) {
+                List<Object> row = new ArrayList();
+                row.add(++i);
+                row.add(item.getDzzmc());
+                row.add(dateUtils.dateToStrFormat(item.getQssj(), "yyyy-MM-dd"));
+                row.add(item.getZt());
+                row.add(item.getDx());
+                row.add(item.getSx());
+                row.add(item.getFs());
+                row.add(item.getFkqk());
+                row.add(item.getCreateusername());
+                row.add(dateUtils.dateToStrFormat(item.getCreatetime(), "yyyy-MM-dd HH:mm:ss"));
+                rows.add(row);
+
+                List<XSSFCellStyle> styles= new ArrayList<>();
+                for(int j=0;j<10;j++){
+                    styles.add(defaultStyle);
+                }
+                cellStyles.add(styles);
+            }
+
+            data.setRows(rows);
+            data.setStyleList(cellStyles);
+        } catch (Exception ex) {
+            wb.close();
+        }
+
+        excelHelper.exportExcelNew(wb , response,  "请示报告制度导出.xlsx", data);
+    }
+}

src/main/java/com/ghsc/partybuild/mapper/PartyLifeMeetingCQuery.java

@@ -1,8 +1,8 @@
 package com.ghsc.partybuild.mapper;
 
-import com.ghsc.partybuild.vo.PartyLifeMeetingPersonnelVo;
-import com.ghsc.partybuild.vo.PartyLifeMeetingScydlVo;
-import com.ghsc.partybuild.vo.PartyLifeMeetingVo;
+import com.ghsc.partybuild.vo.partyLife.PartyLifeMeetingPersonnelVo;
+import com.ghsc.partybuild.vo.partyLife.PartyLifeMeetingScydlVo;
+import com.ghsc.partybuild.vo.partyLife.PartyLifeMeetingVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;

src/main/java/com/ghsc/partybuild/mapper/PfReportsystemMapper.java

@@ -0,0 +1,30 @@
+package com.ghsc.partybuild.mapper;
+
+import com.ghsc.partybuild.model.PfReportsystem;
+import com.ghsc.partybuild.model.PfReportsystemExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface PfReportsystemMapper {
+    long countByExample(PfReportsystemExample example);
+
+    int deleteByExample(PfReportsystemExample example);
+
+    int deleteByPrimaryKey(String id);
+
+    int insert(PfReportsystem record);
+
+    int insertSelective(PfReportsystem record);
+
+    List<PfReportsystem> selectByExample(PfReportsystemExample example);
+
+    PfReportsystem selectByPrimaryKey(String id);
+
+    int updateByExampleSelective(@Param("record") PfReportsystem record, @Param("example") PfReportsystemExample example);
+
+    int updateByExample(@Param("record") PfReportsystem record, @Param("example") PfReportsystemExample example);
+
+    int updateByPrimaryKeySelective(PfReportsystem record);
+
+    int updateByPrimaryKey(PfReportsystem record);
+}

src/main/java/com/ghsc/partybuild/mapper/ReportSystemCQuery.java

@@ -0,0 +1,14 @@
+package com.ghsc.partybuild.mapper;
+
+import com.ghsc.partybuild.vo.partyLife.ReportSystemVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
+
+public interface ReportSystemCQuery {
+    List<ReportSystemVo> selectReportSystemList(@Param("id") String id, @Param("dzzdm") String dzzdm,
+                                                @Param("startDate") Date startDate, @Param("endDate") Date endDate,
+                                                @Param("zt") String zt, @Param("dx") String dx, @Param("sx") String sx);
+
+}

src/main/java/com/ghsc/partybuild/model/PfReportsystem.java

@@ -0,0 +1,125 @@
+package com.ghsc.partybuild.model;
+
+import java.util.Date;
+
+public class PfReportsystem {
+    private String id;
+
+    private String zt;
+
+    private String dx;
+
+    private String dzzdm;
+
+    private Date qssj;
+
+    private String sx;
+
+    private String fs;
+
+    private String fkqk;
+
+    private Date createtime;
+
+    private String createuserid;
+
+    private Date updatetime;
+
+    private String updateuserid;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    public String getZt() {
+        return zt;
+    }
+
+    public void setZt(String zt) {
+        this.zt = zt == null ? null : zt.trim();
+    }
+
+    public String getDx() {
+        return dx;
+    }
+
+    public void setDx(String dx) {
+        this.dx = dx == null ? null : dx.trim();
+    }
+
+    public String getDzzdm() {
+        return dzzdm;
+    }
+
+    public void setDzzdm(String dzzdm) {
+        this.dzzdm = dzzdm == null ? null : dzzdm.trim();
+    }
+
+    public Date getQssj() {
+        return qssj;
+    }
+
+    public void setQssj(Date qssj) {
+        this.qssj = qssj;
+    }
+
+    public String getSx() {
+        return sx;
+    }
+
+    public void setSx(String sx) {
+        this.sx = sx == null ? null : sx.trim();
+    }
+
+    public String getFs() {
+        return fs;
+    }
+
+    public void setFs(String fs) {
+        this.fs = fs == null ? null : fs.trim();
+    }
+
+    public String getFkqk() {
+        return fkqk;
+    }
+
+    public void setFkqk(String fkqk) {
+        this.fkqk = fkqk == null ? null : fkqk.trim();
+    }
+
+    public Date getCreatetime() {
+        return createtime;
+    }
+
+    public void setCreatetime(Date createtime) {
+        this.createtime = createtime;
+    }
+
+    public String getCreateuserid() {
+        return createuserid;
+    }
+
+    public void setCreateuserid(String createuserid) {
+        this.createuserid = createuserid == null ? null : createuserid.trim();
+    }
+
+    public Date getUpdatetime() {
+        return updatetime;
+    }
+
+    public void setUpdatetime(Date updatetime) {
+        this.updatetime = updatetime;
+    }
+
+    public String getUpdateuserid() {
+        return updateuserid;
+    }
+
+    public void setUpdateuserid(String updateuserid) {
+        this.updateuserid = updateuserid == null ? null : updateuserid.trim();
+    }
+}

src/main/java/com/ghsc/partybuild/service/impl/partyLife/MeetingServiceImpl.java

@@ -3,7 +3,7 @@ package com.ghsc.partybuild.service.impl.partyLife;
 import com.ghsc.partybuild.mapper.PfPartylifemeetingPersonnelMapper;
 import com.ghsc.partybuild.mapper.PfPartylifemeetingScydMapper;
 import com.ghsc.partybuild.model.*;
-import com.ghsc.partybuild.vo.PartyLifeMeetingScydlVo;
+import com.ghsc.partybuild.vo.partyLife.PartyLifeMeetingScydlVo;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.ghsc.partybuild.mapper.PartyLifeMeetingCQuery;
@@ -12,7 +12,7 @@ import com.ghsc.partybuild.service.DictionaryService;
 import com.ghsc.partybuild.service.partyLife.MeetingService;
 import com.ghsc.partybuild.util.DateUtils;
 import com.ghsc.partybuild.util.StringUtils;
-import com.ghsc.partybuild.vo.PartyLifeMeetingVo;
+import com.ghsc.partybuild.vo.partyLife.PartyLifeMeetingVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

src/main/java/com/ghsc/partybuild/service/impl/partyLife/ReportSystemServiceImpl.java

@@ -0,0 +1,85 @@
+package com.ghsc.partybuild.service.impl.partyLife;
+
+import com.ghsc.partybuild.mapper.*;
+import com.ghsc.partybuild.model.*;
+import com.ghsc.partybuild.service.partyLife.ReportSystemService;
+import com.ghsc.partybuild.util.StringUtils;
+import com.ghsc.partybuild.vo.partyLife.ReportSystemVo;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+@Service("pfReportSystemService")
+public class ReportSystemServiceImpl implements ReportSystemService {
+    @Autowired
+    private PfReportsystemMapper pfReportsystemMapper;
+    @Autowired
+    private ReportSystemCQuery reportSystemCQuery;
+    @Autowired
+    private StringUtils stringUtils;
+
+    @Override
+    public PageInfo<ReportSystemVo> getList(int pageIndex, int pageSize, String id, String dzzdm, Date startDate, Date endDate, String zt, String dx, String sx){
+        PageHelper.startPage(pageIndex, pageSize);
+        List<ReportSystemVo> list = reportSystemCQuery.selectReportSystemList(id, dzzdm, startDate, endDate, zt, dx, sx);
+
+        PageInfo<ReportSystemVo> result = new PageInfo(list);
+        return result;
+    }
+
+    @Override
+    public ReportSystemVo getReportSystemById(String id) {
+        if (stringUtils.IsNullOrEmpty(id))
+            return null;
+
+        List<ReportSystemVo> list = getList(1,999999, id, null, null, null, null, null, null).getList();
+        return list.size() > 0 ? list.get(0) : null;
+    }
+
+    @Override
+    public int save(ReportSystemVo data, String userId) {
+        int result = 0;
+        PfReportsystem dbModel = pfReportsystemMapper.selectByPrimaryKey(data.getId());
+        if (dbModel == null) {
+            dbModel = new ReportSystemVo();
+            dbModel.setId(data.getId());
+            dbModel.setZt(data.getZt());
+            dbModel.setDx(data.getDx());
+            dbModel.setDzzdm(data.getDzzdm());
+            dbModel.setQssj(data.getQssj());
+            dbModel.setSx(data.getSx());
+            dbModel.setFs(data.getFs());
+            dbModel.setFkqk(data.getFkqk());
+            dbModel.setCreatetime(new Date());
+            dbModel.setCreateuserid(userId);
+
+            result = pfReportsystemMapper.insert(dbModel);
+        } else {
+            dbModel.setZt(data.getZt());
+            dbModel.setDx(data.getDx());
+            dbModel.setDzzdm(data.getDzzdm());
+            dbModel.setQssj(data.getQssj());
+            dbModel.setSx(data.getSx());
+            dbModel.setFs(data.getFs());
+            dbModel.setFkqk(data.getFkqk());
+            data.setUpdatetime(new Date());
+            data.setUpdateuserid(userId);
+
+            result = pfReportsystemMapper.updateByPrimaryKey(data);
+        }
+        
+        return result;
+    }
+
+    @Override
+    public int delete(List<String> meetingIdList) {
+        PfReportsystemExample exp = new PfReportsystemExample();
+        exp.or().andIdIn(meetingIdList);
+
+        return pfReportsystemMapper.deleteByExample(exp);
+    }
+}

src/main/java/com/ghsc/partybuild/service/partyLife/MeetingService.java

@@ -1,7 +1,7 @@
 package com.ghsc.partybuild.service.partyLife;
 
 import com.github.pagehelper.PageInfo;
-import com.ghsc.partybuild.vo.PartyLifeMeetingVo;
+import com.ghsc.partybuild.vo.partyLife.PartyLifeMeetingVo;
 
 import java.util.Date;
 import java.util.List;

src/main/java/com/ghsc/partybuild/service/partyLife/ReportSystemService.java

@@ -0,0 +1,18 @@
+package com.ghsc.partybuild.service.partyLife;
+
+import com.ghsc.partybuild.vo.partyLife.PartyLifeMeetingVo;
+import com.ghsc.partybuild.vo.partyLife.ReportSystemVo;
+import com.github.pagehelper.PageInfo;
+
+import java.util.Date;
+import java.util.List;
+
+public interface ReportSystemService {
+    PageInfo<ReportSystemVo> getList(int pageIndex, int pageSize, String id, String dzzdm, Date startDate, Date endDate, String zt, String dx, String sx);
+
+    ReportSystemVo getReportSystemById(String id);
+
+    int save(ReportSystemVo data, String userId);
+
+    int delete(List<String> meetingIdList);
+}

src/main/java/com/ghsc/partybuild/util/ExcelHelper.java

@@ -197,7 +197,7 @@ public class ExcelHelper {
             if (null == sheetName) {
                 sheetName = "Sheet1";
             }
-            XSSFSheet sheet = wb.createSheet(sheetName);
+            XSSFSheet sheet = wb.getSheetAt(0) != null ? wb.getSheetAt(0) : wb.createSheet(sheetName);
             writeExcel(wb, sheet, data);
 
             wb.write(out);
@@ -377,6 +377,33 @@ public class ExcelHelper {
         style.setVerticalAlignment(VerticalAlignment.CENTER);
     }
 
+    public XSSFCellStyle setDefaultBorder(XSSFWorkbook wb) {
+        Font dataFont = wb.createFont();
+        dataFont.setFontName("simsun");
+        dataFont.setColor(IndexedColors.BLACK.index);
+
+        XSSFCellStyle style = wb.createCellStyle();
+        style.setAlignment(HorizontalAlignment.LEFT);
+        style.setVerticalAlignment(VerticalAlignment.CENTER);
+        style.setFillForegroundColor(new XSSFColor(java.awt.Color.WHITE, new DefaultIndexedColorMap()));
+        style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
+        style.setFont(dataFont);
+        style.setWrapText(true);
+
+        BorderStyle borderStyle = BorderStyle.THIN;
+        XSSFColor borderColor = new XSSFColor(java.awt.Color.BLACK, new DefaultIndexedColorMap());
+        style.setBorderTop(borderStyle);
+        style.setBorderLeft(borderStyle);
+        style.setBorderRight(borderStyle);
+        style.setBorderBottom(borderStyle);
+        style.setBorderColor(XSSFCellBorder.BorderSide.TOP, borderColor);
+        style.setBorderColor(XSSFCellBorder.BorderSide.LEFT, borderColor);
+        style.setBorderColor(XSSFCellBorder.BorderSide.RIGHT, borderColor);
+        style.setBorderColor(XSSFCellBorder.BorderSide.BOTTOM, borderColor);
+
+        return style;
+    }
+
     private void setCellRange(Sheet sheet, List<CellRangeAddress> cellRangeList) {
         for (CellRangeAddress item : cellRangeList) {
             sheet.addMergedRegion(item);

src/main/java/com/ghsc/partybuild/vo/PartyLifeMeetingPersonnelVo.java

@@ -1,4 +1,4 @@
-package com.ghsc.partybuild.vo;
+package com.ghsc.partybuild.vo.partyLife;
 
 import com.ghsc.partybuild.model.PfPartylifemeetingPersonnel;
 import lombok.Data;

src/main/java/com/ghsc/partybuild/vo/PartyLifeMeetingScydlVo.java

@@ -1,4 +1,4 @@
-package com.ghsc.partybuild.vo;
+package com.ghsc.partybuild.vo.partyLife;
 
 import com.ghsc.partybuild.model.PfPartylifemeetingScydKey;
 import lombok.Data;

src/main/java/com/ghsc/partybuild/vo/PartyLifeMeetingVo.java

@@ -1,4 +1,4 @@
-package com.ghsc.partybuild.vo;
+package com.ghsc.partybuild.vo.partyLife;
 
 import com.ghsc.partybuild.model.PfPartylifemeeting;
 import lombok.Data;

src/main/java/com/ghsc/partybuild/vo/partyLife/ReportSystemVo.java

@@ -0,0 +1,11 @@
+package com.ghsc.partybuild.vo.partyLife;
+
+import com.ghsc.partybuild.model.PfReportsystem;
+import lombok.Data;
+
+
+@Data
+public class ReportSystemVo extends PfReportsystem {
+    private String dzzmc;
+    private String createusername;
+}

src/main/resources/generatorConfig.xml

@@ -263,8 +263,9 @@
           <table schema="" tableName="us_party_month"></table>
         <table schema="" tableName="pf_partylifemeeting"></table>
         <table schema="" tableName="pf_partylifemeeting_personnel"></table>
+        <table schema="" tableName="pf_partylifemeeting_scyd"></table>
+        <table schema="" tableName="pf_reportsystem"></table>
 
         -->
-        <table schema="" tableName="pf_partylifemeeting_scyd"></table>
     </context>
 </generatorConfiguration>

src/main/resources/mapping/PartyLifeMeetingCQuery.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.ghsc.partybuild.mapper.PartyLifeMeetingCQuery">
-    <select id="selectMeetingList" resultType="com.ghsc.partybuild.vo.PartyLifeMeetingVo">
+    <select id="selectMeetingList" resultType="com.ghsc.partybuild.vo.partyLife.PartyLifeMeetingVo">
         select pfm.partyLifeMeetingId, pfm.title, pfm.partyCode, pfm.partyLifeMeetingType, pfm.meetingDate,
         pfm.userCount, pfm.address, pfm.createTime, pfm.createUserId, pfm.updateTime, pfm.updateUserId,
         pfm.personnel, pfm.result, pfm.compere,
@@ -43,7 +43,7 @@
         group by c.address
         order by max(c.CREATETIME) desc
     </select>
-    <select id="selectMeetingPersonnelList" resultType="com.ghsc.partybuild.vo.PartyLifeMeetingPersonnelVo">
+    <select id="selectMeetingPersonnelList" resultType="com.ghsc.partybuild.vo.partyLife.PartyLifeMeetingPersonnelVo">
         select pp.id, pp.partyLifeMeetingId, pp.rybm, pp.isAbsenteeism, pp.absenteeismCause,
                pp.createTime, pp.createUserId, pp.updateTime, pp.updateUserId, u.XM, u.RYJBXXBS,
                case when pp.isAbsenteeism=1 then '是' else '否' end as isAbsenteeismName
@@ -52,7 +52,7 @@
         where pp.partyLifeMeetingId = #{partyLifeMeetingId}
         order by pp.createTime
     </select>
-    <select id="selectMeetingScydList" resultType="com.ghsc.partybuild.vo.PartyLifeMeetingScydlVo">
+    <select id="selectMeetingScydList" resultType="com.ghsc.partybuild.vo.partyLife.PartyLifeMeetingScydlVo">
         select a.partyLifeMeetingId,a.scydType,b.DICVALUE as scydTypeName
         from pf_partylifemeeting_scyd a
         inner join cf_dictionary b on b.DICTYPEKEY='scydType' and a.scydType = b.DICKEY

src/main/resources/mapping/PfReportsystemMapper.xml

@@ -0,0 +1,320 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ghsc.partybuild.mapper.PfReportsystemMapper">
+  <resultMap id="BaseResultMap" type="com.ghsc.partybuild.model.PfReportsystem">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="zt" jdbcType="VARCHAR" property="zt" />
+    <result column="dx" jdbcType="VARCHAR" property="dx" />
+    <result column="dzzdm" jdbcType="VARCHAR" property="dzzdm" />
+    <result column="qssj" jdbcType="DATE" property="qssj" />
+    <result column="sx" jdbcType="VARCHAR" property="sx" />
+    <result column="fs" jdbcType="VARCHAR" property="fs" />
+    <result column="fkqk" jdbcType="VARCHAR" property="fkqk" />
+    <result column="createTime" jdbcType="TIMESTAMP" property="createtime" />
+    <result column="createUserId" jdbcType="VARCHAR" property="createuserid" />
+    <result column="updateTime" jdbcType="TIMESTAMP" property="updatetime" />
+    <result column="updateUserId" jdbcType="VARCHAR" property="updateuserid" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, zt, dx, dzzdm, qssj, sx, fs, fkqk, createTime, createUserId, updateTime, updateUserId
+  </sql>
+  <select id="selectByExample" parameterType="com.ghsc.partybuild.model.PfReportsystemExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from pf_reportsystem
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from pf_reportsystem
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from pf_reportsystem
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ghsc.partybuild.model.PfReportsystemExample">
+    delete from pf_reportsystem
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ghsc.partybuild.model.PfReportsystem">
+    insert into pf_reportsystem (id, zt, dx, dzzdm, 
+      qssj, sx, fs, fkqk, 
+      createTime, createUserId, updateTime, 
+      updateUserId)
+    values (#{id,jdbcType=VARCHAR}, #{zt,jdbcType=VARCHAR}, #{dx,jdbcType=VARCHAR}, #{dzzdm,jdbcType=VARCHAR}, 
+      #{qssj,jdbcType=DATE}, #{sx,jdbcType=VARCHAR}, #{fs,jdbcType=VARCHAR}, #{fkqk,jdbcType=VARCHAR}, 
+      #{createtime,jdbcType=TIMESTAMP}, #{createuserid,jdbcType=VARCHAR}, #{updatetime,jdbcType=TIMESTAMP}, 
+      #{updateuserid,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.ghsc.partybuild.model.PfReportsystem">
+    insert into pf_reportsystem
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="zt != null">
+        zt,
+      </if>
+      <if test="dx != null">
+        dx,
+      </if>
+      <if test="dzzdm != null">
+        dzzdm,
+      </if>
+      <if test="qssj != null">
+        qssj,
+      </if>
+      <if test="sx != null">
+        sx,
+      </if>
+      <if test="fs != null">
+        fs,
+      </if>
+      <if test="fkqk != null">
+        fkqk,
+      </if>
+      <if test="createtime != null">
+        createTime,
+      </if>
+      <if test="createuserid != null">
+        createUserId,
+      </if>
+      <if test="updatetime != null">
+        updateTime,
+      </if>
+      <if test="updateuserid != null">
+        updateUserId,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="zt != null">
+        #{zt,jdbcType=VARCHAR},
+      </if>
+      <if test="dx != null">
+        #{dx,jdbcType=VARCHAR},
+      </if>
+      <if test="dzzdm != null">
+        #{dzzdm,jdbcType=VARCHAR},
+      </if>
+      <if test="qssj != null">
+        #{qssj,jdbcType=DATE},
+      </if>
+      <if test="sx != null">
+        #{sx,jdbcType=VARCHAR},
+      </if>
+      <if test="fs != null">
+        #{fs,jdbcType=VARCHAR},
+      </if>
+      <if test="fkqk != null">
+        #{fkqk,jdbcType=VARCHAR},
+      </if>
+      <if test="createtime != null">
+        #{createtime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createuserid != null">
+        #{createuserid,jdbcType=VARCHAR},
+      </if>
+      <if test="updatetime != null">
+        #{updatetime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateuserid != null">
+        #{updateuserid,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ghsc.partybuild.model.PfReportsystemExample" resultType="java.lang.Long">
+    select count(*) from pf_reportsystem
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update pf_reportsystem
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.zt != null">
+        zt = #{record.zt,jdbcType=VARCHAR},
+      </if>
+      <if test="record.dx != null">
+        dx = #{record.dx,jdbcType=VARCHAR},
+      </if>
+      <if test="record.dzzdm != null">
+        dzzdm = #{record.dzzdm,jdbcType=VARCHAR},
+      </if>
+      <if test="record.qssj != null">
+        qssj = #{record.qssj,jdbcType=DATE},
+      </if>
+      <if test="record.sx != null">
+        sx = #{record.sx,jdbcType=VARCHAR},
+      </if>
+      <if test="record.fs != null">
+        fs = #{record.fs,jdbcType=VARCHAR},
+      </if>
+      <if test="record.fkqk != null">
+        fkqk = #{record.fkqk,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createtime != null">
+        createTime = #{record.createtime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.createuserid != null">
+        createUserId = #{record.createuserid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updatetime != null">
+        updateTime = #{record.updatetime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updateuserid != null">
+        updateUserId = #{record.updateuserid,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update pf_reportsystem
+    set id = #{record.id,jdbcType=VARCHAR},
+      zt = #{record.zt,jdbcType=VARCHAR},
+      dx = #{record.dx,jdbcType=VARCHAR},
+      dzzdm = #{record.dzzdm,jdbcType=VARCHAR},
+      qssj = #{record.qssj,jdbcType=DATE},
+      sx = #{record.sx,jdbcType=VARCHAR},
+      fs = #{record.fs,jdbcType=VARCHAR},
+      fkqk = #{record.fkqk,jdbcType=VARCHAR},
+      createTime = #{record.createtime,jdbcType=TIMESTAMP},
+      createUserId = #{record.createuserid,jdbcType=VARCHAR},
+      updateTime = #{record.updatetime,jdbcType=TIMESTAMP},
+      updateUserId = #{record.updateuserid,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ghsc.partybuild.model.PfReportsystem">
+    update pf_reportsystem
+    <set>
+      <if test="zt != null">
+        zt = #{zt,jdbcType=VARCHAR},
+      </if>
+      <if test="dx != null">
+        dx = #{dx,jdbcType=VARCHAR},
+      </if>
+      <if test="dzzdm != null">
+        dzzdm = #{dzzdm,jdbcType=VARCHAR},
+      </if>
+      <if test="qssj != null">
+        qssj = #{qssj,jdbcType=DATE},
+      </if>
+      <if test="sx != null">
+        sx = #{sx,jdbcType=VARCHAR},
+      </if>
+      <if test="fs != null">
+        fs = #{fs,jdbcType=VARCHAR},
+      </if>
+      <if test="fkqk != null">
+        fkqk = #{fkqk,jdbcType=VARCHAR},
+      </if>
+      <if test="createtime != null">
+        createTime = #{createtime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createuserid != null">
+        createUserId = #{createuserid,jdbcType=VARCHAR},
+      </if>
+      <if test="updatetime != null">
+        updateTime = #{updatetime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateuserid != null">
+        updateUserId = #{updateuserid,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ghsc.partybuild.model.PfReportsystem">
+    update pf_reportsystem
+    set zt = #{zt,jdbcType=VARCHAR},
+      dx = #{dx,jdbcType=VARCHAR},
+      dzzdm = #{dzzdm,jdbcType=VARCHAR},
+      qssj = #{qssj,jdbcType=DATE},
+      sx = #{sx,jdbcType=VARCHAR},
+      fs = #{fs,jdbcType=VARCHAR},
+      fkqk = #{fkqk,jdbcType=VARCHAR},
+      createTime = #{createtime,jdbcType=TIMESTAMP},
+      createUserId = #{createuserid,jdbcType=VARCHAR},
+      updateTime = #{updatetime,jdbcType=TIMESTAMP},
+      updateUserId = #{updateuserid,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

src/main/resources/mapping/ReportSystemCQuery.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ghsc.partybuild.mapper.ReportSystemCQuery">
+    <select id="selectReportSystemList" resultType="com.ghsc.partybuild.vo.partyLife.ReportSystemVo">
+        select pr.id, pr.zt, pr.dx, pr.dzzdm, pr.qssj, pr.sx, pr.fs, pr.fkqk,
+        pr.createTime, pr.createUserId, pr.updateTime, pr.updateUserId,
+        zz.dzzmc, cu.username as createusername
+        from pf_reportsystem pr
+        left join zz_zzqkxx zz on pr.dzzdm = zz.dzzdm
+        left join cf_users cu on pr.CREATEUSERID = cu.USERID
+        where 1=1
+        <if test="id != null and id != ''">
+            and pr.id = #{id}
+        </if>
+        <if test="dzzdm != null and dzzdm != ''">
+            and pr.dzzdm like concat('%',#{dzzdm},'%')
+        </if>
+        <if test="startDate != null">
+            and pr.qssj <![CDATA[ >= ]]> #{startDate}
+        </if>
+        <if test="endDate != null">
+            and pr.qssj <![CDATA[ < ]]> date_add(#{endDate}, interval 1 day)
+        </if>
+        <if test="zt != null and zt != ''">
+            and pr.zt like concat('%',#{zt},'%')
+        </if>
+        <if test="dx != null and dx != ''">
+            and pr.dx like concat('%',#{dx},'%')
+        </if>
+        <if test="sx != null and sx != ''">
+            and pr.sx like concat('%',#{sx},'%')
+        </if>
+        order by pr.createTime desc
+    </select>
+</mapper>

src/main/resources/static/app/main/app.js

@@ -3145,6 +3145,42 @@
                     return $ocLazyLoad.load('../main/partylife/scyd/detail.js?' + window.sysVersion);
                 }]
             }
+        }).state("home.pf_reportsystemList", {
+            url: "pf_reportsystemList",
+            templateUrl: "../main/partylife/reportsystem/list.html?" + window.sysVersion,
+            controller: "pf_reportsystemListCtrl",
+            resolve: {
+                load: ['$ocLazyLoad', function ($ocLazyLoad) {
+                    return $ocLazyLoad.load('../main/partylife/reportsystem/list.js?' + window.sysVersion);
+                }]
+            }
+        }).state("home.pf_reportsystemEdit", {
+            url: "pf_reportsystemEdit",
+            templateUrl: "../main/partylife/reportsystem/edit.html?" + window.sysVersion,
+            controller: "pf_reportsystemEditCtrl",
+            resolve: {
+                load: ['$ocLazyLoad', function ($ocLazyLoad) {
+                    return $ocLazyLoad.load('../main/partylife/reportsystem/edit.js?' + window.sysVersion);
+                }]
+            }
+        }).state("home.pf_reportsystemAdd", {
+            url: "pf_reportsystemAdd",
+            templateUrl: "../main/partylife/reportsystem/edit.html?" + window.sysVersion,
+            controller: "pf_reportsystemEditCtrl",
+            resolve: {
+                load: ['$ocLazyLoad', function ($ocLazyLoad) {
+                    return $ocLazyLoad.load('../main/partylife/reportsystem/edit.js?' + window.sysVersion);
+                }]
+            }
+        }).state("home.pf_reportsystemDetail", {
+            url: "pf_reportsystemDetail",
+            templateUrl: "../main/partylife/reportsystem/detail.html?" + window.sysVersion,
+            controller: "pf_reportsystemDetailCtrl",
+            resolve: {
+                load: ['$ocLazyLoad', function ($ocLazyLoad) {
+                    return $ocLazyLoad.load('../main/partylife/reportsystem/detail.js?' + window.sysVersion);
+                }]
+            }
         }).state("register", {
             url: "/register",
             templateUrl: "../main/partyUser/admit/register/edit.html?" + window.sysVersion,

src/main/resources/static/app/main/partylife/meeting/detail.html

@@ -16,7 +16,7 @@
                             <th>主持人</th>
                             <td>{{dataModel.compere}}</td>
                             <th>会议地址</th>
-                            <td>{{dataModel.address}}</td>
+                            <td colspan="3">{{dataModel.address}}</td>
                         </tr>
                     </table>
                 </div>

src/main/resources/static/app/main/partylife/meeting/edit.js

@@ -129,6 +129,10 @@
                 $scope.dataModel = result.data.item;
                 $scope.dataModel.partylifemeetingtype = $scope.editParams.partyLifeMeetingType;
                 $scope.reqFileModel.selectdata.FileRefID = $scope.dataModel.partylifemeetingid;
+                if(!$scope.dataModel.partycode){
+                    $scope.dataModel.partycode = AuthUser.getUser().DPCode;
+                    $scope.dataModel.partyname = AuthUser.getUser().DPName;
+                }
             }, function (resp) {
                 $scope.showMsg('错误', '服务器错误：' + resp.data);
             });

src/main/resources/static/app/main/partylife/meeting/list.html

@@ -33,7 +33,7 @@
                                     <div class="col-lg-2 col-md-2">
                                         <div class="form-group">
                                             <div class="form-line">
-                                                <input name="name" class="form-control" type="text"
+                                                <input name="title" class="form-control" type="text"
                                                        ng-keypress="($event.which === 13)?search():0"
                                                        ng-model="selectparams.title"
                                                        placeholder=""/>

src/main/resources/static/app/main/partylife/reportSystem/detail.html

@@ -0,0 +1,34 @@
+<titlemenu></titlemenu>
+<div class="dj-card">
+    <div class="dj-body" activate-input activate-select>
+        <div class="card">
+                <div class="dj-formtable">
+                    <table class="dj-table dj-table3">
+                        <tr>
+                            <th>所属党组织</th>
+                            <td>{{dataModel.dzzmc}}</td>
+                            <th>请求主体</th>
+                            <td>{{dataModel.zt}}</td>
+                            <th>请求对象</th>
+                            <td>{{dataModel.dx}}</td>
+                        </tr>
+                        <tr>
+                            <th>请示时间</th>
+                            <td>{{dataModel.qssj | date:'yyyy-MM-dd'}}</td>
+                            <th>请示报告事项</th>
+                            <td>{{dataModel.sx}}</td>
+                            <th>请示报告方式</th>
+                            <td>{{dataModel.fs}}</td>
+                        </tr>
+                        <tr>
+                            <th>请示报告反馈情况</th>
+                            <td colspan="5">
+                                {{dataModel.fkqk}}
+                            </td>
+                        </tr>
+                    </table>
+                </div>
+            <bsfiles ng-model="reqFileModel"/>
+        </div>
+    </div>
+</div>

src/main/resources/static/app/main/partylife/reportSystem/detail.js

@@ -0,0 +1,37 @@
+(function ($app) {
+    $app.module('gtPartyApp').controller('pf_reportsystemDetailCtrl', function ($scope, $http, $modal, $ocLazyLoad, $alert, $loading, $state, $bsRouterState, AuthUser, $timeout, $excel, $partySelect, $filter) {
+        $scope.editParams = $bsRouterState.$params($scope);
+        $scope.pageId = $bsRouterState.tabs.activeTab;
+        $scope.dataModel = {};
+
+        $scope.getData = function () {
+            $http
+            ({
+                method: 'get', url: "../../api/partylife/reportsystem/get",
+                params: {
+                    'id': $scope.editParams.id
+                }
+            }).then(function (result) {
+                $scope.dataModel = result.data.item;
+                $scope.reqFileModel.selectdata.FileRefID = $scope.dataModel.id;
+            }, function (resp) {
+                $scope.showMsg('错误', '服务器错误：' + resp.data);
+            });
+        };
+
+        $scope.getData();
+
+        $scope.reqFileModel = {
+            selectdata: {FileRefID: '', pageindex: 1, pagesize: 10, ptotal: 0},//查询参数：FileRefID为文件关联ID
+            filetype: 71,//文件类型
+            items: [],//列表数据地址
+            readonly: true,//是否只能查看
+            title: '附件',
+            addFileButton: '上传'
+        };
+
+        $scope.pagechange = function () {
+            $bsRouterState.$closeTab($scope);
+        };
+    });
+})(angular);

src/main/resources/static/app/main/partylife/reportSystem/edit.html

@@ -0,0 +1,80 @@
+<titlemenu></titlemenu>
+<div class="dj-card">
+    <div class="dj-body" activate-input activate-select>
+        <div class="card">
+                <form class="form-horizontal" role="form" id="editForm"
+                      name="editForm" ng-submit="save(editForm.$valid)" novalidate>
+                    <div class="dj-formtable">
+                        <table class="dj-table dj-table3">
+                            <tr>
+                                <th>所属党组织</th>
+                                <td>
+                                    <div class="input-group input-group-search"
+                                         title="选择党组织" ng-click="selectParty()">
+                                        <input name="dzzmc" type="text" ng-model="dataModel.dzzmc"
+                                               class="form-control" ng-required="true"
+                                               ng-disabled="true"/>
+                                        <span class="input-group-addon"><i class="material-icons">search</i></span>
+                                    </div>
+                                    <span ng-show="this.editForm.dzzmc.$invalid &&  this.editForm.$submitted"
+                                          class="error">必填.</span>
+                                </td>
+                                <th>请求主体</th>
+                                <td ng-class="{ 'has-error' : this.editForm.zt.$invalid &&  this.editForm.$submitted}">
+                                    <input type="text" class="form-control" name="zt" autocomplete="off" autoclose="true"
+                                           ng-model="dataModel.zt" ng-required="true"/>
+                                    <span ng-show="this.editForm.zt.$invalid &&  this.editForm.$submitted"
+                                          class="error">必填.</span>
+                                </td>
+                                <th>请求对象</th>
+                                <td ng-class="{ 'has-error' : this.editForm.dx.$invalid &&  this.editForm.$submitted}">
+                                    <input type="text" class="form-control" name="dx" autocomplete="off" autoclose="true"
+                                           ng-model="dataModel.dx" ng-required="true"/>
+                                    <span ng-show="this.editForm.dx.$invalid &&  this.editForm.$submitted"
+                                          class="error">必填.</span>
+                                </td>
+                            </tr>
+                            <tr>
+                                <th>请示时间</th>
+                                <td ng-class="{ 'has-error' : this.editForm.qssj.$invalid &&  this.editForm.$submitted}">
+                                    <input name="qssj" class="form-control"
+                                           autocomplete="off" autoclose="true"
+                                           data-date-format="yyyy-MM-dd" data-date-type="date"
+                                           ng-model="dataModel.qssj"
+                                           placeholder="" bs-datepicker ng-required="true"/>
+                                    <span ng-show="this.editForm.qssj.$invalid &&  this.editForm.$submitted"
+                                          class="error">必填.</span>
+                                </td>
+                                <th>请示报告事项</th>
+                                <td ng-class="{ 'has-error' : this.editForm.sx.$invalid &&  this.editForm.$submitted}">
+                                    <input type="text" class="form-control" name="sx" ng-required="true"
+                                           autocomplete="off" autoclose="true" ng-model="dataModel.sx"/>
+                                    <span ng-show="this.editForm.sx.$invalid &&  this.editForm.$submitted"
+                                          class="error">必填.</span>
+                                </td>
+                                <th>请示报告方式</th>
+                                <td ng-class="{ 'has-error' : this.editForm.fs.$invalid &&  this.editForm.$submitted}">
+                                    <input type="text" class="form-control" name="fs" ng-required="true"
+                                           autocomplete="off" autoclose="true" ng-model="dataModel.fs"/>
+                                    <span ng-show="this.editForm.fs.$invalid &&  this.editForm.$submitted"
+                                          class="error">必填.</span>
+                                </td>
+                            </tr>
+                            <tr>
+                                <th style="width: 5%;">请示报告反馈情况</th>
+                                <td colspan="5">
+                                   <textarea name="fkqk" ng-model="dataModel.fkqk"
+                                             class="form-control" rows="3"></textarea>
+                                </td>
+                            </tr>
+                        </table>
+                    </div>
+                    <bsfiles ng-model="reqFileModel"/>
+                    <div class="form_foot">
+                        <button type="button" class="btn btn-default" ng-click="pagechange()">取消</button>
+                        <button type="submit" class="btn btn-primary" form="editForm">保存</button>
+                    </div>
+                </form>
+        </div>
+    </div>
+</div>

src/main/resources/static/app/main/partylife/reportSystem/edit.js

@@ -0,0 +1,89 @@
+(function ($app) {
+    $app.module('gtPartyApp').controller('pf_reportsystemEditCtrl', function ($scope, $http, $modal, $ocLazyLoad, $alert, $loading, $state, $bsRouterState, AuthUser, $timeout, $excel, $partySelect, $filter) {
+        $scope.editParams = $bsRouterState.$params($scope);
+        $scope.pageId = $bsRouterState.tabs.activeTab;
+        $scope.dataModel = {};
+
+        $scope.reqFileModel = {
+            selectdata: {FileRefID: '', pageindex: 1, pagesize: 10, ptotal: 0},//查询参数：FileRefID为文件关联ID
+            filetype: 71,//文件类型
+            items: [],//列表数据地址
+            readonly: false,//是否只能查看
+            title: '附件',
+            addFileButton: '上传'
+        };
+
+        //选择党支部
+        $scope.partyConfig = {
+            scope: $scope,
+            selectedKey: '',
+            selectedText: '',
+            selectedData: [],
+            isMulti: false,
+            isshowxz: 1
+        };
+        $partySelect.initServer($scope.partyConfig);
+        $scope.$watch("partyConfig.selectedKey", function (newVal, oldVal) {
+            if (newVal) {
+                $scope.dataModel.dzzdm = $scope.partyConfig.selectedKey;
+                $scope.dataModel.dzzmc = $scope.partyConfig.selectedText;
+
+                $scope.partyConfig.selectedText = "";
+                $scope.partyConfig.selectedKey = "";
+            }
+        }, true);
+        $scope.selectParty = function () {
+            $partySelect.showModal();
+        };
+
+        $scope.getData = function () {
+            $http
+            ({
+                method: 'get', url: "../../api/partylife/reportsystem/get",
+                params: {
+                    'id': $scope.editParams.id
+                }
+            }).then(function (result) {
+                $scope.dataModel = result.data.item;
+                $scope.reqFileModel.selectdata.FileRefID = $scope.dataModel.id;
+                if(!$scope.dataModel.dzzdm){
+                    $scope.dataModel.dzzdm = AuthUser.getUser().DPCode;
+                    $scope.dataModel.dzzmc = AuthUser.getUser().DPName;
+                }
+            }, function (resp) {
+                $scope.showMsg('错误', '服务器错误：' + resp.data);
+            });
+        };
+
+        $scope.save = function (isflag) {
+            if (isflag) {
+
+                $loading.show();
+                $http({
+                    method: "post",
+                    url: "../../api/partylife/reportsystem/save",
+                    data: $scope.dataModel
+                }).then(function (result) {
+                    $loading.hide();
+                    if (result.data.success) {
+                        $scope.showMsg('成功', "操作成功");
+                        $scope.pagechange();
+                        //重新刷新列表
+                        $scope.$emit("tabReloadData", {name: 'pf_reportsystemListCtrl', data: 1});
+                    } else {
+                        $scope.showMsg('失败', result.data.msg);
+                    }
+                }, function (resp) {
+                    $loading.hide();
+                    $scope.showMsg('错误', '服务器错误：' + resp.data);
+                });
+            }
+        };
+
+        $scope.pagechange = function () {
+            $bsRouterState.$closeTab($scope);
+        };
+
+        $scope.getData();
+    });
+})(angular);

src/main/resources/static/app/main/partylife/reportSystem/list.html

@@ -0,0 +1,216 @@
+<titlemenu></titlemenu>
+<div class="dj-list">
+    <div class="dj-list-body">
+        <div party-tree data-selectdzzdm="treeparams.selectdzzdm" data-selectdzzmc="treeparams.selectdzzmc"
+             data-defaultselected="treeparams.defaultselected" data-isunfold="treeparams.isunfold"></div>
+        <div class="dj-list-content">
+            <div class="card">
+                <div activate-input activate-select class="header search-header">
+                    <div fold-partytree data-isunfold="treeparams.isunfold"></div>
+                    <div class="search-param-panel">
+                        <div class="search-input">
+                            <form class="form-horizontal">
+                                <div class="row clearfix form-inline">
+                                    <div class="col-lg-2 col-md-2 dj-label">
+                                        <label>当前选中组织</label>
+                                    </div>
+                                    <div class="col-lg-2 col-md-2">
+                                        <div class="form-group">
+                                            <div class="form-line">
+                                                <div class="input-group input-group-search">
+                                                    <input name="selectdzzmc" type="text" style="min-width: 90px"
+                                                           ng-model="treeparams.selectdzzmc" class="form-control"
+                                                           ng-disabled="true"/>
+                                                    <span class="input-group-addon"
+                                                          ng-click="setisunfold()">选择</span>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="col-lg-2 col-md-2 dj-label">
+                                        <label>请示时间</label>
+                                    </div>
+                                    <div class="col-lg-2 col-md-2">
+                                        <div class="form-group">
+                                            <div class="form-line">
+                                                <input name="startDate" class="form-control fm-ct-first"
+                                                       autocomplete="off"
+                                                       autoclose="true"
+                                                       data-date-format="yyyy-MM-dd" data-date-type="string"
+                                                       ng-model="selectparams.startDate"
+                                                       ng-change="search()"
+                                                       placeholder="" bs-datepicker/>
+                                                <input name="endDate" class="form-control fm-ct-last"
+                                                       autocomplete="off"
+                                                       autoclose="true"
+                                                       data-date-format="yyyy-MM-dd" data-date-type="string"
+                                                       ng-model="selectparams.endDate"
+                                                       ng-change="search()"
+                                                       placeholder="" bs-datepicker/>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="col-lg-2 col-md-2 dj-label">
+                                        <label>请示报告主体</label>
+                                    </div>
+                                    <div class="col-lg-2 col-md-2">
+                                        <div class="form-group">
+                                            <div class="form-line">
+                                                <input name="zt" class="form-control" type="text"
+                                                       ng-keypress="($event.which === 13)?search():0"
+                                                       ng-model="selectparams.zt"
+                                                       placeholder=""/>
+
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="row clearfix form-inline" ng-show="isShow">
+                                    <div class="col-lg-2 col-md-2 dj-label">
+                                        <label>请示报告对象</label>
+                                    </div>
+                                    <div class="col-lg-2 col-md-2">
+                                        <div class="form-group">
+                                            <div class="form-line">
+                                                <input name="dx" class="form-control" type="text"
+                                                       ng-keypress="($event.which === 13)?search():0"
+                                                       ng-model="selectparams.dx"
+                                                       placeholder=""/>
+
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="col-lg-2 col-md-2 dj-label">
+                                        <label>请示报告事项</label>
+                                    </div>
+                                    <div class="col-lg-2 col-md-2">
+                                        <div class="form-group">
+                                            <div class="form-line">
+                                                <input name="sx" class="form-control" type="text"
+                                                       ng-keypress="($event.which === 13)?search():0"
+                                                       ng-model="selectparams.sx"
+                                                       placeholder=""/>
+
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </form>
+                        </div>
+                        <div class="search-btn" style="margin-right: 20px;">
+                            <div style="min-width: 13em">
+                                <span class="moreSpan" ng-click="isShowClick()" style='padding-right:1em;cursor:pointer;'>
+                                    {{moreTxt}}<i class="material-icons" style="position: relative;top:7px;">{{isShow ? 'expand_less' : 'expand_more'}}</i></span>
+                                <button class="btn btn-default1"
+                                        ng-click="search()">查询
+                                </button>
+                                <button class="btn btn-default1"
+                                        ng-click="reset()">重置
+                                </button>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="search-btn" style="margin-right: 20px;">
+                        <div style="float: right">
+                            <button class="btn btn-default1"
+                                    ng-click="add()">新增
+                            </button>
+                            <button class="btn btn-default1"
+                                    ng-click="delete()">删除
+                            </button>
+                            <button class="btn btn-default1"
+                                    ng-click="export()">导出
+                            </button>
+                        </div>
+                    </div>
+                </div>
+                <div class="body">
+                    <div class="zero-list-table-panel">
+                        <div class="zero-source-table-div">
+                            <table class="table table-bordered table-striped table-hover js-basic-example dataTable text-nowrap">
+                                <thead>
+                                <tr>
+                                    <th>
+                                        <input type="checkbox" id="{{pageId}}_md_checkbox_all"
+                                               class="filled-in chk-col-red" ng-checked="isAll==true"
+                                               ng-click="selectAll()"/>
+                                        <label class="checkbox_lable" style="height: 10px;"
+                                               for="{{pageId}}_md_checkbox_all"></label></th>
+                                    <th>序号</th>
+                                    <th>所属党组织</th>
+                                    <th>请示时间</th>
+                                    <th>请示报告主体</th>
+                                    <th>请示报告对象</th>
+                                    <th>请示报告事项</th>
+                                    <th>请示报告方式</th>
+                                    <th>请示报告反馈情况</th>
+                                    <th>创建人</th>
+                                    <th>创建时间</th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                <tr ng-repeat="it in dataList">
+                                    <td class="text-center">
+                                        <input type="checkbox" id="{{pageId}}_md_checkbox_{{$index+1}}"
+                                               class="filled-in chk-col-red" ng-checked="it.checked==1"
+                                               ng-click="it.checked==1?it.checked=0:it.checked=1"/>
+                                        <label class="checkbox_lable" style="top:6px;"
+                                               for="{{pageId}}_md_checkbox_{{$index+1}}"></label>
+                                    </td>
+                                    <td scope="row" class="text-center">
+                                        {{selectparams.pagesize*(selectparams.pageindex-1)+$index+1}}
+                                    </td>
+                                    <td>{{it.dzzmc}}</td>
+                                    <td>{{it.qssj | date:'yyyy-MM-dd'}}</td>
+                                    <td>{{it.zt}}</td>
+                                    <td>{{it.dx}}</td>
+                                    <td>{{it.sx}}</td>
+                                    <td>{{it.fs}}</td>
+                                    <td style="min-width: 150px !important;word-wrap: break-word;word-break: break-all;white-space: normal;">{{it.fkqk}}</td>
+                                    <td>{{it.createusername}}</td>
+                                    <td>{{it.createtime | date:'yyyy-MM-dd HH:mm:ss'}}</td>
+                                </tr>
+                                <tr ng-if="dataList.length<=0">
+                                    <td colspan="15" style="text-align:center">暂无数据</td>
+                                </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                        <div class="zero-target-table-div">
+                            <table class="table table-bordered table-striped table-hover js-basic-example dataTable text-nowrap">
+                                <thead>
+                                <tr>
+                                    <th>操作</th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                <tr ng-repeat="it in dataList" zero-table-height>
+                                    <td>
+                                        <button class="btn td-btn bg-light-green waves-effect"
+                                                ng-click="show(it.id)"
+                                                title="查看">
+                                            查看
+                                        </button>
+                                        <button
+                                                role-permission-code="brandMgList.btnEdit"
+                                                class="btn td-btn bg-light-green waves-effect"
+                                                ng-click="edit(it.id)"
+                                                title="修改">
+                                            修改
+                                        </button>
+                                    </td>
+                                </tr>
+                                <tr ng-if="pageInfo.ptotal==0">
+                                    <td colspan="1" style="text-align:center">无</td>
+                                </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+                    <pagination data-pageindex="selectparams.pageindex" data-pagesize="selectparams.pagesize"
+                                data-ptotal="pageInfo.ptotal"></pagination>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>

src/main/resources/static/app/main/partylife/reportSystem/list.js

@@ -0,0 +1,173 @@
+(function ($app) {
+    $app.module('gtPartyApp').controller('pf_reportsystemListCtrl', function ($scope, $http, $modal, $ocLazyLoad, $alert, $loading, $state, $bsRouterState, AuthUser, $timeout, $excel, $partySelect, $filter) {
+        $scope.loginUserId = AuthUser.getUser().Id;
+        $scope.isShow = false;
+        $scope.moreTxt = "更多";
+        $scope.isAll = false;
+        $scope.tabNameAdd = "home.pf_reportsystemAdd";
+        $scope.tabNameEdit = "home.pf_reportsystemEdit";
+        $scope.tabNameDetail = "home.pf_reportsystemDetail";
+
+        //定义数据集合
+        $scope.dataList = []; //列表数据
+        //组织树参数
+        $scope.treeparams = {
+            isunfold: false,//组织结构树展开收缩
+            selectdzzdm: "",
+            selectdzzmc: "",
+            defaultselected: $state.params.dzzdm
+        };
+        $scope.resetTreeparams = angular.copy($scope.treeparams);
+
+        //查询条件
+        $scope.selectparams = {
+            pageindex: 1,
+            pagesize: 10,
+            partyLifeMeetingType: $scope.partyLifeMeetingType,
+            dzzdm: '',
+            startDate: null,
+            endDate: null,
+            zt: '',
+            dx: '',
+            sx: ''
+        };
+        $scope.resetSelectparams = angular.copy($scope.selectparams);
+        $scope.pageInfo = {ptotal: 0};
+
+        $scope.$on('tabChildReloadData', function (event, data) {
+            if (data.name == 'pf_reportsystemListCtrl') {
+                $scope.loadData();
+            }
+        });
+
+        //加载列表数据
+        $scope.loadData = function () {
+            $http
+            ({
+                method: 'get', url: '../../api/partylife/reportsystem/getList', params: $scope.selectparams
+            }).then(function (result) {
+                $scope.dataList = result.data.item.list;
+                $scope.pageInfo.ptotal = result.data.item.total;
+            }, function (res) {
+                $scope.showMsg('错误', '服务器错误');
+            });
+        };
+
+        $scope.search = function () {
+            $scope.loadData();
+        };
+
+        $scope.selectAll = function () {
+            $scope.isAll = !$scope.isAll;
+            angular.forEach($scope.dataList, function (item) {
+                item.checked = $scope.isAll ? 1 : 0;
+            });
+        };
+
+        //查看
+        $scope.show = function (id) {
+            $bsRouterState.$closeTabName($scope.tabNameDetail);
+            $timeout(function () {
+                $bsRouterState.go($scope.tabNameDetail, {
+                    id: id
+                });
+            }, 100);
+        };
+
+        //新增
+        $scope.add = function () {
+            $bsRouterState.$closeTabName($scope.tabNameAdd);
+            $timeout(function () {
+                $bsRouterState.go($scope.tabNameAdd, {
+                    id: ''
+                });
+            }, 100);
+        };
+
+        //修改
+        $scope.edit = function (id) {
+            $bsRouterState.$closeTabName($scope.tabNameEdit);
+            $timeout(function () {
+                $bsRouterState.go($scope.tabNameEdit, {
+                    id: id
+                });
+            }, 100);
+        };
+
+        $scope.export = function () {
+            var params = "?1=1";
+            for (var p in $scope.selectparams) {
+                if ($scope.selectparams[p] !== '' && $scope.selectparams[p] !== null)
+                    params += ("&" + p + "=" + encodeURI($scope.selectparams[p]));
+            }
+            window.open('../../api/partylife/reportsystem/export' + params);
+        };
+
+        $scope.delete = function (id) {
+            var ids = [];
+            if (id)
+                ids.push(id);
+            else
+                ids = $scope.dataList.filter(it => it.checked == true).map(it => it.id);
+
+            if (ids.length == 0) {
+                $scope.showMsg('消息', "请选择需要删除的数据");
+                return false;
+            }
+
+            if (confirm("确定删除？")) {
+                $loading.show();
+                $http({
+                    method: "post",
+                    url: "../../api/partylife/reportsystem/delete",
+                    data: {
+                        ids: JSON.stringify(ids)
+                    }
+                }).then(function (result) {
+                    $loading.hide();
+                    if (result.data.success) {
+                        $scope.showMsg('成功', result.data.msg);
+                        //重新刷新列表
+                        $scope.loadData();
+                    } else {
+                        $scope.showMsg('失败', result.data.msg);
+                    }
+                }, function (resp) {
+                    $scope.showMsg('错误', '服务器错误');
+                });
+            }
+        };
+
+        $scope.$watch("selectparams.pageindex", function (newVal, oldVal) {
+            if ($scope.pageInfo.ptotal > 0) {
+                $scope.loadData();
+            }
+        });
+        $scope.$watch("treeparams.selectdzzdm", function (newVal, oldVal) {
+            if (newVal != "") {
+                if ($scope.treeparams.defaultselected != "" && $scope.treeparams.defaultselected != null &&
+                    $scope.treeparams.defaultselected != $scope.treeparams.selectdzzdm)
+                    return;
+
+                $scope.selectparams.dzzdm = $scope.treeparams.selectdzzdm;
+
+                $scope.loadData();
+            }
+        });
+        $scope.setisunfold = function () {
+            $scope.treeparams.isunfold = !$scope.treeparams.isunfold;
+            $scope.$emit('menudatas.toggle', !$scope.treeparams.isunfold);
+        };
+        $scope.isShowClick = function () {
+            $scope.isShow = !$scope.isShow;
+            $scope.moreTxt = $scope.isShow ? "收起" : "更多";
+        };
+        $scope.reset = function () {
+            $scope.selectparams = angular.copy($scope.resetSelectparams);
+            $scope.treeparams = angular.copy($scope.resetTreeparams);
+            $scope.loadData();
+        };
+
+        $scope.loadData();
+    });
+})(angular);

src/main/resources/static/app/main/partylife/scyd/detail.html

@@ -16,7 +16,7 @@
                             <th>主持人</th>
                             <td>{{dataModel.compere}}</td>
                             <th>会议地址</th>
-                            <td>{{dataModel.address}}</td>
+                            <td colspan="3">{{dataModel.address}}</td>
                         </tr>
                         <tr>
                             <th>“三重一大”类别</th>

src/main/resources/static/app/main/partylife/scyd/edit.js

@@ -143,6 +143,10 @@
                 $scope.dataModel = result.data.item;
                 $scope.dataModel.partylifemeetingtype = $scope.editParams.partyLifeMeetingType;
                 $scope.reqFileModel.selectdata.FileRefID = $scope.dataModel.partylifemeetingid;
+                if(!$scope.dataModel.partycode){
+                    $scope.dataModel.partycode = AuthUser.getUser().DPCode;
+                    $scope.dataModel.partyname = AuthUser.getUser().DPName;
+                }
 
                 $scope.getUserAddressList();
                 $scope.loadScydTypes();

src/main/resources/static/app/main/partylife/scyd/list.html

@@ -33,7 +33,7 @@
                                     <div class="col-lg-2 col-md-2">
                                         <div class="form-group">
                                             <div class="form-line">
-                                                <input name="name" class="form-control" type="text"
+                                                <input name="title" class="form-control" type="text"
                                                        ng-keypress="($event.which === 13)?search():0"
                                                        ng-model="selectparams.title"
                                                        placeholder=""/>