党风廉政建设-纪律教育学习月活动

lib/数据更新脚本.txt

@@ -77,3 +77,46 @@ INSERT INTO `cf_menu` (`MENUID`, `APPLICATIONID`, `PARENTMENUID`, `MNUSYSTEM`, `
 INSERT INTO `cf_menu` (`MENUID`, `APPLICATIONID`, `PARENTMENUID`, `MNUSYSTEM`, `MENUORDER`, `MENUNO`, `MENUNAME`, `MENUPROGRAM`, `MENUPIC`, `MENUDESC`, `ISVISIBLE`, `ISLEAF`, `ISBLANK`) VALUES ('e6b08580-0001-4051-813c-4e95032b6937', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', 'e6b08580-0000-4051-813c-4e95032b6937', NULL, 1, 'home.pf_djscgzEdit', '编辑党建“双创”工作', '', '', '', 0, 0, 1);
 INSERT INTO `cf_menu` (`MENUID`, `APPLICATIONID`, `PARENTMENUID`, `MNUSYSTEM`, `MENUORDER`, `MENUNO`, `MENUNAME`, `MENUPROGRAM`, `MENUPIC`, `MENUDESC`, `ISVISIBLE`, `ISLEAF`, `ISBLANK`) VALUES ('e6b08580-0000-4051-813c-4e95032b6937', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', '1f783c90-a760-43db-8946-b24618f90175', NULL, 2, 'home.pf_djscgzList', '党建“双创”工作', '', '', '', 1, 0, 0);
 
+
+-- 2024.7.11 党风廉政建设
+-- 纪律教育学习月活动
+DROP TABLE IF EXISTS `pf_jljyxxyhd`;
+CREATE TABLE `pf_jljyxxyhd`  (
+  `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT 'id',
+  `dzzdm` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '所属党组织',
+  `hdmc` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '活动名称',
+  `rq` varchar(24) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '日期',
+  `create_time` datetime NULL  DEFAULT NULL COMMENT '创建时间',
+  `create_userid` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人',
+  `update_time` datetime NULL DEFAULT NULL COMMENT '修改时间',
+  `update_userid` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '修改人',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = DYNAMIC COMMENT'纪律教育学习月活动';
+SET FOREIGN_KEY_CHECKS = 1;
+
+-- 纪律教育学习月活动-统计明细表
+DROP TABLE IF EXISTS `pf_jljyxxyhd_fb`;
+CREATE TABLE `pf_jljyxxyhd_fb`  (
+  `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT 'id',
+  `jljyxxyhd_id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '纪律教育学习月活动id',
+  `zdgz` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '重点工作',
+  `mc` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '名称',
+  `sj` varchar(24) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '时间',
+  `jydx` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '教育对象',
+  `cjrs` int NULL DEFAULT NULL COMMENT '参加人数',
+  `remark` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备注',
+  `create_time` datetime NULL  DEFAULT NULL COMMENT '创建时间',
+  `create_userid` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人',
+  `update_time` datetime NULL DEFAULT NULL COMMENT '修改时间',
+  `update_userid` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '修改人',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = DYNAMIC COMMENT'纪律教育学习月活动-统计明细表';
+SET FOREIGN_KEY_CHECKS = 1;
+
+
+INSERT INTO `cf_menu` (`MENUID`, `APPLICATIONID`, `PARENTMENUID`, `MNUSYSTEM`, `MENUORDER`, `MENUNO`, `MENUNAME`, `MENUPROGRAM`, `MENUPIC`, `MENUDESC`, `ISVISIBLE`, `ISLEAF`, `ISBLANK`) VALUES ('1f783c90-a760-0000-8946-b24618f90175', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', 'c4516fca-2dd8-4373-9be8-1df510c8e5e1', NULL, 7, '党风廉政建设', '党风廉政建设', '', '', '', 1, 0, NULL);
+
+INSERT INTO `cf_menu` (`MENUID`, `APPLICATIONID`, `PARENTMENUID`, `MNUSYSTEM`, `MENUORDER`, `MENUNO`, `MENUNAME`, `MENUPROGRAM`, `MENUPIC`, `MENUDESC`, `ISVISIBLE`, `ISLEAF`, `ISBLANK`) VALUES ('1f783c90-a760-0000-0003-b24618f90175', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', '1f783c90-a760-0000-0000-b24618f90175', NULL, 3, 'home.pf_jljyxxyhdDetail', '查看纪律教育学习月活动详情', '', '', '', 0, 0, 1);
+INSERT INTO `cf_menu` (`MENUID`, `APPLICATIONID`, `PARENTMENUID`, `MNUSYSTEM`, `MENUORDER`, `MENUNO`, `MENUNAME`, `MENUPROGRAM`, `MENUPIC`, `MENUDESC`, `ISVISIBLE`, `ISLEAF`, `ISBLANK`) VALUES ('1f783c90-a760-0000-0002-b24618f90175', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', '1f783c90-a760-0000-0000-b24618f90175', NULL, 2, 'home.pf_jljyxxyhdAdd', '新增纪律教育学习月活动', '', '', '', 0, 0, 1);
+INSERT INTO `cf_menu` (`MENUID`, `APPLICATIONID`, `PARENTMENUID`, `MNUSYSTEM`, `MENUORDER`, `MENUNO`, `MENUNAME`, `MENUPROGRAM`, `MENUPIC`, `MENUDESC`, `ISVISIBLE`, `ISLEAF`, `ISBLANK`) VALUES ('1f783c90-a760-0000-0001-b24618f90175', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', '1f783c90-a760-0000-0000-b24618f90175', NULL, 1, 'home.pf_jljyxxyhdEdit', '编辑纪律教育学习月活动', '', '', '', 0, 0, 1);
+INSERT INTO `cf_menu` (`MENUID`, `APPLICATIONID`, `PARENTMENUID`, `MNUSYSTEM`, `MENUORDER`, `MENUNO`, `MENUNAME`, `MENUPROGRAM`, `MENUPIC`, `MENUDESC`, `ISVISIBLE`, `ISLEAF`, `ISBLANK`) VALUES ('1f783c90-a760-0000-0000-b24618f90175', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', '1f783c90-a760-0000-8946-b24618f90175', NULL, 1, 'home.pf_jljyxxyhdList', '纪律教育学习月活动', '', '', '', 1, 0, 0);

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

@@ -0,0 +1,186 @@
+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.DictionaryService;
+import com.ghsc.partybuild.service.UserService;
+import com.ghsc.partybuild.service.partyLife.PfJljyxxyhdService;
+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.partyLife.PfJljyxxyhdVo;
+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.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.*;
+
+@Slf4j
+@RestController
+@RequestMapping(value = "/api/partylife/jljyxxyhd")
+public class PfJljyxxyhdController {
+    @Autowired
+    private PfJljyxxyhdService pfJljyxxyhdService;
+    @Autowired
+    private UserService userService;
+    @Autowired
+    private DictionaryService dictionaryService;
+    @Autowired
+    private StringUtils stringUtils;
+    @Autowired
+    private DateUtils dateUtils;
+    private static final String dateTimeFormat = "yyyy-MM-dd";
+
+    @ResponseBody
+    @GetMapping("/getList")
+    public RequsetData<PageInfo<PfJljyxxyhdVo>> getList(int pageindex, int pagesize, @RequestParam(required = false) String dzzdm, @RequestParam(required = false) String hdmc, @RequestParam(required = false) String startDate, @RequestParam(required = false) String endDate) {
+        RequsetData<PageInfo<PfJljyxxyhdVo>> result = new RequsetData<>();
+        result.setItem(pfJljyxxyhdService.getList(pageindex, pagesize, null, dzzdm, hdmc, startDate,endDate));
+        return result;
+    }
+
+    @ResponseBody
+    @GetMapping("/get")
+    public RequsetData<PfJljyxxyhdVo> get(@RequestParam(required = false) String id) {
+        RequsetData<PfJljyxxyhdVo> res = new RequsetData<>();
+
+        PfJljyxxyhdVo model = pfJljyxxyhdService.getPfJljyxxyhdById(id);
+        if (model == null) {
+            UUID uuid = UUID.randomUUID();
+            model = new PfJljyxxyhdVo();
+            model.setId(uuid.toString());
+            model.setFblist(new ArrayList<>());
+        }
+
+        res.setItem(model);
+        return res;
+    }
+
+    @ResponseBody
+    @PostMapping("/save")
+    public RequsetData<String> save(@RequestBody PfJljyxxyhdVo data) {
+        RequsetData<String> result = new RequsetData<String>();
+        int count = 0;
+        String message = "";
+
+        try {
+            count = pfJljyxxyhdService.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 = pfJljyxxyhdService.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) String hdmc, @RequestParam(required = false) String startDate, @RequestParam(required = false) String endDate) throws Exception {
+        /**查询数据**/
+        List<PfJljyxxyhdVo> dataList = pfJljyxxyhdService.getPfJljyxxyhdFbList(dzzdm, hdmc, startDate, endDate);
+
+        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 * 20);
+        sheet.setColumnWidth(5, 256 * 20);
+        sheet.setColumnWidth(6, 256 * 15);
+        sheet.setColumnWidth(9, 256 * 50);
+        sheet.setColumnWidth(11, 256 * 15);
+
+        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("备注");
+            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 (PfJljyxxyhdVo item : dataList) {
+                List<Object> row = new ArrayList();
+                row.add(++i);
+                row.add(item.getDzzmc());
+                row.add(item.getHdmc());
+                row.add(item.getRq());
+                row.add(item.getZdgz());
+                row.add(item.getMc());
+                row.add(item.getSj());
+                row.add(item.getJydx());
+                row.add(item.getCjrs());
+                row.add(item.getRemark());
+                row.add(item.getCreateUsername());
+                row.add(dateUtils.dateToStrFormat(item.getCreateTime(), "yyyy-MM-dd"));
+                rows.add(row);
+
+                List<XSSFCellStyle> styles= new ArrayList<>();
+                for(int j=0;j<titles.size();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/PfJljyxxyhdCQuery.java

@@ -0,0 +1,12 @@
+package com.ghsc.partybuild.mapper;
+
+import com.ghsc.partybuild.vo.partyLife.PfJljyxxyhdVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface PfJljyxxyhdCQuery {
+    List<PfJljyxxyhdVo> selectPfJljyxxyhdList(@Param("id") String id, @Param("dzzdm") String dzzdm, @Param("hdmc") String hdmc, @Param("startDate") String startDate, @Param("endDate") String endDate);
+    
+    List<PfJljyxxyhdVo> selectPfJljyxxyhdFbList(@Param("jljyxxyhdId") String jljyxxyhdId, @Param("dzzdm") String dzzdm, @Param("hdmc") String hdmc, @Param("startDate") String startDate, @Param("endDate") String endDate);
+}

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

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

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

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

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

@@ -0,0 +1,85 @@
+package com.ghsc.partybuild.model;
+
+import java.util.Date;
+
+public class PfJljyxxyhd {
+    private String id;
+
+    private String dzzdm;
+
+    private String hdmc;
+
+    private String rq;
+
+    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 getDzzdm() {
+        return dzzdm;
+    }
+
+    public void setDzzdm(String dzzdm) {
+        this.dzzdm = dzzdm == null ? null : dzzdm.trim();
+    }
+
+    public String getHdmc() {
+        return hdmc;
+    }
+
+    public void setHdmc(String hdmc) {
+        this.hdmc = hdmc == null ? null : hdmc.trim();
+    }
+
+    public String getRq() {
+        return rq;
+    }
+
+    public void setRq(String rq) {
+        this.rq = rq == null ? null : rq.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/model/PfJljyxxyhdExample.java

@@ -0,0 +1,741 @@
+package com.ghsc.partybuild.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class PfJljyxxyhdExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public PfJljyxxyhdExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(String value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(String value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(String value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(String value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(String value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLike(String value) {
+            addCriterion("id like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotLike(String value) {
+            addCriterion("id not like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<String> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<String> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(String value1, String value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(String value1, String value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andDzzdmIsNull() {
+            addCriterion("dzzdm is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDzzdmIsNotNull() {
+            addCriterion("dzzdm is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDzzdmEqualTo(String value) {
+            addCriterion("dzzdm =", value, "dzzdm");
+            return (Criteria) this;
+        }
+
+        public Criteria andDzzdmNotEqualTo(String value) {
+            addCriterion("dzzdm <>", value, "dzzdm");
+            return (Criteria) this;
+        }
+
+        public Criteria andDzzdmGreaterThan(String value) {
+            addCriterion("dzzdm >", value, "dzzdm");
+            return (Criteria) this;
+        }
+
+        public Criteria andDzzdmGreaterThanOrEqualTo(String value) {
+            addCriterion("dzzdm >=", value, "dzzdm");
+            return (Criteria) this;
+        }
+
+        public Criteria andDzzdmLessThan(String value) {
+            addCriterion("dzzdm <", value, "dzzdm");
+            return (Criteria) this;
+        }
+
+        public Criteria andDzzdmLessThanOrEqualTo(String value) {
+            addCriterion("dzzdm <=", value, "dzzdm");
+            return (Criteria) this;
+        }
+
+        public Criteria andDzzdmLike(String value) {
+            addCriterion("dzzdm like", value, "dzzdm");
+            return (Criteria) this;
+        }
+
+        public Criteria andDzzdmNotLike(String value) {
+            addCriterion("dzzdm not like", value, "dzzdm");
+            return (Criteria) this;
+        }
+
+        public Criteria andDzzdmIn(List<String> values) {
+            addCriterion("dzzdm in", values, "dzzdm");
+            return (Criteria) this;
+        }
+
+        public Criteria andDzzdmNotIn(List<String> values) {
+            addCriterion("dzzdm not in", values, "dzzdm");
+            return (Criteria) this;
+        }
+
+        public Criteria andDzzdmBetween(String value1, String value2) {
+            addCriterion("dzzdm between", value1, value2, "dzzdm");
+            return (Criteria) this;
+        }
+
+        public Criteria andDzzdmNotBetween(String value1, String value2) {
+            addCriterion("dzzdm not between", value1, value2, "dzzdm");
+            return (Criteria) this;
+        }
+
+        public Criteria andHdmcIsNull() {
+            addCriterion("hdmc is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHdmcIsNotNull() {
+            addCriterion("hdmc is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHdmcEqualTo(String value) {
+            addCriterion("hdmc =", value, "hdmc");
+            return (Criteria) this;
+        }
+
+        public Criteria andHdmcNotEqualTo(String value) {
+            addCriterion("hdmc <>", value, "hdmc");
+            return (Criteria) this;
+        }
+
+        public Criteria andHdmcGreaterThan(String value) {
+            addCriterion("hdmc >", value, "hdmc");
+            return (Criteria) this;
+        }
+
+        public Criteria andHdmcGreaterThanOrEqualTo(String value) {
+            addCriterion("hdmc >=", value, "hdmc");
+            return (Criteria) this;
+        }
+
+        public Criteria andHdmcLessThan(String value) {
+            addCriterion("hdmc <", value, "hdmc");
+            return (Criteria) this;
+        }
+
+        public Criteria andHdmcLessThanOrEqualTo(String value) {
+            addCriterion("hdmc <=", value, "hdmc");
+            return (Criteria) this;
+        }
+
+        public Criteria andHdmcLike(String value) {
+            addCriterion("hdmc like", value, "hdmc");
+            return (Criteria) this;
+        }
+
+        public Criteria andHdmcNotLike(String value) {
+            addCriterion("hdmc not like", value, "hdmc");
+            return (Criteria) this;
+        }
+
+        public Criteria andHdmcIn(List<String> values) {
+            addCriterion("hdmc in", values, "hdmc");
+            return (Criteria) this;
+        }
+
+        public Criteria andHdmcNotIn(List<String> values) {
+            addCriterion("hdmc not in", values, "hdmc");
+            return (Criteria) this;
+        }
+
+        public Criteria andHdmcBetween(String value1, String value2) {
+            addCriterion("hdmc between", value1, value2, "hdmc");
+            return (Criteria) this;
+        }
+
+        public Criteria andHdmcNotBetween(String value1, String value2) {
+            addCriterion("hdmc not between", value1, value2, "hdmc");
+            return (Criteria) this;
+        }
+
+        public Criteria andRqIsNull() {
+            addCriterion("rq is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRqIsNotNull() {
+            addCriterion("rq is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRqEqualTo(String value) {
+            addCriterion("rq =", value, "rq");
+            return (Criteria) this;
+        }
+
+        public Criteria andRqNotEqualTo(String value) {
+            addCriterion("rq <>", value, "rq");
+            return (Criteria) this;
+        }
+
+        public Criteria andRqGreaterThan(String value) {
+            addCriterion("rq >", value, "rq");
+            return (Criteria) this;
+        }
+
+        public Criteria andRqGreaterThanOrEqualTo(String value) {
+            addCriterion("rq >=", value, "rq");
+            return (Criteria) this;
+        }
+
+        public Criteria andRqLessThan(String value) {
+            addCriterion("rq <", value, "rq");
+            return (Criteria) this;
+        }
+
+        public Criteria andRqLessThanOrEqualTo(String value) {
+            addCriterion("rq <=", value, "rq");
+            return (Criteria) this;
+        }
+
+        public Criteria andRqLike(String value) {
+            addCriterion("rq like", value, "rq");
+            return (Criteria) this;
+        }
+
+        public Criteria andRqNotLike(String value) {
+            addCriterion("rq not like", value, "rq");
+            return (Criteria) this;
+        }
+
+        public Criteria andRqIn(List<String> values) {
+            addCriterion("rq in", values, "rq");
+            return (Criteria) this;
+        }
+
+        public Criteria andRqNotIn(List<String> values) {
+            addCriterion("rq not in", values, "rq");
+            return (Criteria) this;
+        }
+
+        public Criteria andRqBetween(String value1, String value2) {
+            addCriterion("rq between", value1, value2, "rq");
+            return (Criteria) this;
+        }
+
+        public Criteria andRqNotBetween(String value1, String value2) {
+            addCriterion("rq not between", value1, value2, "rq");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUseridIsNull() {
+            addCriterion("create_userid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUseridIsNotNull() {
+            addCriterion("create_userid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUseridEqualTo(String value) {
+            addCriterion("create_userid =", value, "createUserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUseridNotEqualTo(String value) {
+            addCriterion("create_userid <>", value, "createUserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUseridGreaterThan(String value) {
+            addCriterion("create_userid >", value, "createUserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUseridGreaterThanOrEqualTo(String value) {
+            addCriterion("create_userid >=", value, "createUserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUseridLessThan(String value) {
+            addCriterion("create_userid <", value, "createUserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUseridLessThanOrEqualTo(String value) {
+            addCriterion("create_userid <=", value, "createUserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUseridLike(String value) {
+            addCriterion("create_userid like", value, "createUserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUseridNotLike(String value) {
+            addCriterion("create_userid not like", value, "createUserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUseridIn(List<String> values) {
+            addCriterion("create_userid in", values, "createUserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUseridNotIn(List<String> values) {
+            addCriterion("create_userid not in", values, "createUserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUseridBetween(String value1, String value2) {
+            addCriterion("create_userid between", value1, value2, "createUserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUseridNotBetween(String value1, String value2) {
+            addCriterion("create_userid not between", value1, value2, "createUserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("update_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("update_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(Date value) {
+            addCriterion("update_time =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(Date value) {
+            addCriterion("update_time <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(Date value) {
+            addCriterion("update_time >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("update_time >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(Date value) {
+            addCriterion("update_time <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("update_time <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<Date> values) {
+            addCriterion("update_time in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<Date> values) {
+            addCriterion("update_time not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(Date value1, Date value2) {
+            addCriterion("update_time between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("update_time not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUseridIsNull() {
+            addCriterion("update_userid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUseridIsNotNull() {
+            addCriterion("update_userid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUseridEqualTo(String value) {
+            addCriterion("update_userid =", value, "updateUserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUseridNotEqualTo(String value) {
+            addCriterion("update_userid <>", value, "updateUserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUseridGreaterThan(String value) {
+            addCriterion("update_userid >", value, "updateUserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUseridGreaterThanOrEqualTo(String value) {
+            addCriterion("update_userid >=", value, "updateUserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUseridLessThan(String value) {
+            addCriterion("update_userid <", value, "updateUserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUseridLessThanOrEqualTo(String value) {
+            addCriterion("update_userid <=", value, "updateUserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUseridLike(String value) {
+            addCriterion("update_userid like", value, "updateUserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUseridNotLike(String value) {
+            addCriterion("update_userid not like", value, "updateUserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUseridIn(List<String> values) {
+            addCriterion("update_userid in", values, "updateUserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUseridNotIn(List<String> values) {
+            addCriterion("update_userid not in", values, "updateUserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUseridBetween(String value1, String value2) {
+            addCriterion("update_userid between", value1, value2, "updateUserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUseridNotBetween(String value1, String value2) {
+            addCriterion("update_userid not between", value1, value2, "updateUserid");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

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

@@ -0,0 +1,125 @@
+package com.ghsc.partybuild.model;
+
+import java.util.Date;
+
+public class PfJljyxxyhdFb {
+    private String id;
+
+    private String jljyxxyhdId;
+
+    private String zdgz;
+
+    private String mc;
+
+    private String sj;
+
+    private String jydx;
+
+    private Integer cjrs;
+
+    private String remark;
+
+    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 getJljyxxyhdId() {
+        return jljyxxyhdId;
+    }
+
+    public void setJljyxxyhdId(String jljyxxyhdId) {
+        this.jljyxxyhdId = jljyxxyhdId == null ? null : jljyxxyhdId.trim();
+    }
+
+    public String getZdgz() {
+        return zdgz;
+    }
+
+    public void setZdgz(String zdgz) {
+        this.zdgz = zdgz == null ? null : zdgz.trim();
+    }
+
+    public String getMc() {
+        return mc;
+    }
+
+    public void setMc(String mc) {
+        this.mc = mc == null ? null : mc.trim();
+    }
+
+    public String getSj() {
+        return sj;
+    }
+
+    public void setSj(String sj) {
+        this.sj = sj == null ? null : sj.trim();
+    }
+
+    public String getJydx() {
+        return jydx;
+    }
+
+    public void setJydx(String jydx) {
+        this.jydx = jydx == null ? null : jydx.trim();
+    }
+
+    public Integer getCjrs() {
+        return cjrs;
+    }
+
+    public void setCjrs(Integer cjrs) {
+        this.cjrs = cjrs;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.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

@@ -92,6 +92,8 @@ public class MeetingServiceImpl implements MeetingService {
             dbModel.setCompere(data.getCompere());
             dbModel.setCreatetime(new Date());
             dbModel.setCreateuserid(userId);
+            dbModel.setUpdatetime(new Date());
+            dbModel.setUpdateuserid(userId);
 
             result = pfPartylifemeetingMapper.insert(dbModel);
         } else {
@@ -104,10 +106,10 @@ public class MeetingServiceImpl implements MeetingService {
             dbModel.setPersonnel(data.getPersonnel());
             dbModel.setResult(data.getResult());
             dbModel.setCompere(data.getCompere());
-            data.setUpdatetime(new Date());
-            data.setUpdateuserid(userId);
+            dbModel.setUpdatetime(new Date());
+            dbModel.setUpdateuserid(userId);
 
-            result = pfPartylifemeetingMapper.updateByPrimaryKey(data);
+            result = pfPartylifemeetingMapper.updateByPrimaryKey(dbModel);
         }
 
         //出席人员

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

@@ -0,0 +1,117 @@
+package com.ghsc.partybuild.service.impl.partyLife;
+
+import com.ghsc.partybuild.mapper.*;
+import com.ghsc.partybuild.model.*;
+import com.ghsc.partybuild.service.partyLife.PfJljyxxyhdService;
+import com.ghsc.partybuild.util.StringUtils;
+import com.ghsc.partybuild.vo.partyLife.PfJljyxxyhdVo;
+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.*;
+
+@Service("PfJljyxxyhdService")
+public class PfJljyxxyhdServiceImpl implements PfJljyxxyhdService {
+    @Autowired
+    private PfJljyxxyhdMapper pfJljyxxyhdMapper;
+    @Autowired
+    private PfJljyxxyhdFbMapper pfJljyxxyhdFbMapper;
+    @Autowired
+    private PfJljyxxyhdCQuery pfJljyxxyhdCQuery;
+    @Autowired
+    private StringUtils stringUtils;
+
+    @Override
+    public PageInfo<PfJljyxxyhdVo> getList(int pageIndex, int pageSize, String id, String dzzdm, String hdmc, String startDate, String endDate){
+        PageHelper.startPage(pageIndex, pageSize);
+        List<PfJljyxxyhdVo> list = pfJljyxxyhdCQuery.selectPfJljyxxyhdList(id, dzzdm, hdmc, startDate, endDate);
+
+        PageInfo<PfJljyxxyhdVo> result = new PageInfo(list);
+        return result;
+    }
+
+    @Override
+    public List<PfJljyxxyhdVo> getPfJljyxxyhdFbList(String dzzdm, String hdmc, String startDate, String endDate){
+
+        return pfJljyxxyhdCQuery.selectPfJljyxxyhdFbList(null, dzzdm, hdmc, startDate, endDate);
+    }
+
+    @Override
+    public PfJljyxxyhdVo getPfJljyxxyhdById(String id) {
+        if (stringUtils.IsNullOrEmpty(id))
+            return null;
+
+        List<PfJljyxxyhdVo> list = getList(1,999999, id, null, null, null, null).getList();
+        PfJljyxxyhdVo data = list.size() > 0 ? list.get(0) : null;
+        if(data != null){
+            PfJljyxxyhdFbExample emp = new PfJljyxxyhdFbExample();
+            emp.or().andJljyxxyhdIdEqualTo(data.getId());
+            data.setFblist(pfJljyxxyhdFbMapper.selectByExample(emp));
+        }
+        return data;
+    }
+
+    @Override
+    public int save(PfJljyxxyhdVo data, String userId) {
+        int result = 0;
+        PfJljyxxyhd dbModel = pfJljyxxyhdMapper.selectByPrimaryKey(data.getId());
+        if (dbModel == null) {
+            dbModel = new PfJljyxxyhdVo();
+            dbModel.setId(data.getId());
+            dbModel.setDzzdm(data.getDzzdm());
+            dbModel.setHdmc(data.getHdmc());
+            dbModel.setRq(data.getRq());
+            dbModel.setCreateTime(new Date());
+            dbModel.setCreateUserid(userId);
+            dbModel.setUpdateTime(new Date());
+            dbModel.setUpdateUserid(userId);
+
+            result = pfJljyxxyhdMapper.insert(dbModel);
+        } else {
+            dbModel.setDzzdm(data.getDzzdm());
+            dbModel.setHdmc(data.getHdmc());
+            dbModel.setRq(data.getRq());
+            dbModel.setUpdateTime(new Date());
+            dbModel.setUpdateUserid(userId);
+
+            result = pfJljyxxyhdMapper.updateByPrimaryKey(data);
+        }
+
+        //统计明细表
+        PfJljyxxyhdFbExample emp = new PfJljyxxyhdFbExample();
+        emp.or().andJljyxxyhdIdEqualTo(data.getId());
+        pfJljyxxyhdFbMapper.deleteByExample(emp);
+        if(data.getFblist().size() > 0){
+            data.getFblist().forEach(item -> {
+                PfJljyxxyhdFb fbModel = new PfJljyxxyhdFb();
+                fbModel.setId(UUID.randomUUID().toString());
+                fbModel.setJljyxxyhdId(data.getId());
+                fbModel.setZdgz(item.getZdgz());
+                fbModel.setMc(item.getMc());
+                fbModel.setSj(item.getSj());
+                fbModel.setJydx(item.getJydx());
+                fbModel.setCjrs(item.getCjrs());
+                fbModel.setRemark(item.getRemark());
+                fbModel.setCreateTime(new Date());
+                fbModel.setCreateUserid(userId);
+
+                pfJljyxxyhdFbMapper.insert(fbModel);
+            });
+        }
+        return result;
+    }
+
+    @Override
+    public int delete(List<String> idList) {
+        PfJljyxxyhdExample emp = new PfJljyxxyhdExample();
+        emp.or().andIdIn(idList);
+
+        PfJljyxxyhdFbExample fbEmp = new PfJljyxxyhdFbExample();
+        fbEmp.or().andJljyxxyhdIdIn(idList);
+        pfJljyxxyhdFbMapper.deleteByExample(fbEmp);
+
+        return pfJljyxxyhdMapper.deleteByExample(emp);
+    }
+}

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

@@ -0,0 +1,18 @@
+package com.ghsc.partybuild.service.partyLife;
+
+import com.ghsc.partybuild.vo.partyLife.PfJljyxxyhdVo;
+import com.github.pagehelper.PageInfo;
+
+import java.util.List;
+
+public interface PfJljyxxyhdService {
+    PageInfo<PfJljyxxyhdVo> getList(int pageIndex, int pageSize, String id, String dzzdm, String hdmc, String startDate, String endDate);
+
+    List<PfJljyxxyhdVo> getPfJljyxxyhdFbList(String dzzdm, String hdmc, String startDate, String endDate);
+
+    PfJljyxxyhdVo getPfJljyxxyhdById(String id);
+
+    int save(PfJljyxxyhdVo data, String userId);
+
+    int delete(List<String> idList);
+}

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

@@ -0,0 +1,22 @@
+package com.ghsc.partybuild.vo.partyLife;
+
+import com.ghsc.partybuild.model.PfJljyxxyhd;
+import com.ghsc.partybuild.model.PfJljyxxyhdFb;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PfJljyxxyhdVo extends PfJljyxxyhd {
+    public String dzzmc;
+    public String createUsername;
+    public String jljyxxyhdId;
+    public String zdgz;
+    public String mc;
+    public String sj;
+    public String jydx;
+    public Integer cjrs;
+    public String remark;
+    public List<PfJljyxxyhdFb> fblist;
+    public String error;
+}

src/main/resources/generatorConfig.xml

@@ -279,6 +279,8 @@
         <table schema="" tableName="pt_reportScore"></table>
         <table schema="" tableName="pf_dnjzjy"></table>
         <table schema="" tableName="pf_djscgz"></table>
+        <table schema="" tableName="pf_jljyxxyhd"></table>
+        <table schema="" tableName="pf_jljyxxyhd_fb"></table>
 
         -->
     </context>

src/main/resources/mapping/PfJljyxxyhdCQuery.xml

@@ -0,0 +1,72 @@
+<?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.PfJljyxxyhdCQuery">
+    <resultMap id="BaseResultMap" type="com.ghsc.partybuild.vo.partyLife.PfJljyxxyhdVo">
+        <id column="id" jdbcType="VARCHAR" property="id" />
+        <result column="dzzdm" jdbcType="VARCHAR" property="dzzdm" />
+        <result column="hdmc" jdbcType="VARCHAR" property="hdmc" />
+        <result column="rq" jdbcType="VARCHAR" property="rq" />
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+        <result column="create_userid" jdbcType="VARCHAR" property="createUserid" />
+        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+        <result column="update_userid" jdbcType="VARCHAR" property="updateUserid" />
+        <result column="dzzmc" jdbcType="VARCHAR" property="dzzmc" />
+        <result column="create_username" jdbcType="VARCHAR" property="createUsername" />
+        <result column="jljyxxyhd_id" jdbcType="VARCHAR" property="jljyxxyhdId" />
+        <result column="mc" jdbcType="VARCHAR" property="mc" />
+        <result column="sj" jdbcType="VARCHAR" property="sj" />
+        <result column="jydx" jdbcType="VARCHAR" property="jydx" />
+        <result column="cjrs" jdbcType="INTEGER" property="cjrs" />
+        <result column="remark" jdbcType="VARCHAR" property="remark" />
+    </resultMap>
+    <select id="selectPfJljyxxyhdList" resultMap="BaseResultMap">
+        select pj.id, pj.dzzdm, pj.hdmc, pj.rq, pj.create_time, pj.create_userid, pj.update_time, pj.update_userid,
+        zz.dzzmc,cu.username as create_username
+        from pf_jljyxxyhd pj
+        left join zz_zzqkxx zz on pj.dzzdm = zz.DZZDM
+        left join cf_users cu on pj.create_userid = cu.USERID
+        where 1=1
+        <if test="id != null and id != ''">
+            and pj.id = #{id}
+        </if>
+        <if test="dzzdm != null and dzzdm != ''">
+            and pj.dzzdm like concat('%',#{dzzdm},'%')
+        </if>
+        <if test="hdmc != null and hdmc != ''">
+            and pj.hdmc like concat('%',#{hdmc},'%')
+        </if>
+        <if test="startDate != null">
+            and pj.rq <![CDATA[ >= ]]> #{startDate}
+        </if>
+        <if test="endDate != null">
+            and pj.rq <![CDATA[ <= ]]> #{endDate}
+        </if>
+        order by pj.create_time desc
+    </select>
+    <select id="selectPfJljyxxyhdFbList" resultMap="BaseResultMap">
+        select pj.id, pj.dzzdm, pj.hdmc, pj.rq, pj.create_time, pj.create_userid, pj.update_time, pj.update_userid,
+               pjf.id as jljyxxyhd_id,pjf.zdgz, pjf.mc, pjf.sj, pjf.jydx, pjf.cjrs, pjf.remark,
+               zz.dzzmc,cu.username as create_username
+        from pf_jljyxxyhd pj
+                 left join pf_jljyxxyhd_fb pjf on pj.id = pjf.jljyxxyhd_id
+                 left join zz_zzqkxx zz on pj.dzzdm = zz.DZZDM
+                 left join cf_users cu on pj.create_userid = cu.USERID
+        where 1=1
+        <if test="jljyxxyhdId != null and jljyxxyhdId != ''">
+            and pjf.jljyxxyhd_id = #{jljyxxyhdId}
+        </if>
+        <if test="dzzdm != null and dzzdm != ''">
+            and pj.dzzdm like concat('%',#{dzzdm},'%')
+        </if>
+        <if test="hdmc != null and hdmc != ''">
+            and pj.hdmc like concat('%',#{hdmc},'%')
+        </if>
+        <if test="startDate != null">
+            and pj.rq <![CDATA[ >= ]]> #{startDate}
+        </if>
+        <if test="endDate != null">
+            and pj.rq <![CDATA[ <= ]]> #{endDate}
+        </if>
+        order by pj.create_time desc
+    </select>
+</mapper>

src/main/resources/mapping/PfJljyxxyhdFbMapper.xml

@@ -0,0 +1,321 @@
+<?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.PfJljyxxyhdFbMapper">
+  <resultMap id="BaseResultMap" type="com.ghsc.partybuild.model.PfJljyxxyhdFb">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="jljyxxyhd_id" jdbcType="VARCHAR" property="jljyxxyhdId" />
+    <result column="zdgz" jdbcType="VARCHAR" property="zdgz" />
+    <result column="mc" jdbcType="VARCHAR" property="mc" />
+    <result column="sj" jdbcType="VARCHAR" property="sj" />
+    <result column="jydx" jdbcType="VARCHAR" property="jydx" />
+    <result column="cjrs" jdbcType="INTEGER" property="cjrs" />
+    <result column="remark" jdbcType="VARCHAR" property="remark" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="create_userid" jdbcType="VARCHAR" property="createUserid" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="update_userid" 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, jljyxxyhd_id, zdgz, mc, sj, jydx, cjrs, remark, create_time, create_userid, update_time, 
+    update_userid
+  </sql>
+  <select id="selectByExample" parameterType="com.ghsc.partybuild.model.PfJljyxxyhdFbExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from pf_jljyxxyhd_fb
+    <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_jljyxxyhd_fb
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from pf_jljyxxyhd_fb
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ghsc.partybuild.model.PfJljyxxyhdFbExample">
+    delete from pf_jljyxxyhd_fb
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ghsc.partybuild.model.PfJljyxxyhdFb">
+    insert into pf_jljyxxyhd_fb (id, jljyxxyhd_id, zdgz, 
+      mc, sj, jydx, cjrs, 
+      remark, create_time, create_userid, 
+      update_time, update_userid)
+    values (#{id,jdbcType=VARCHAR}, #{jljyxxyhdId,jdbcType=VARCHAR}, #{zdgz,jdbcType=VARCHAR}, 
+      #{mc,jdbcType=VARCHAR}, #{sj,jdbcType=VARCHAR}, #{jydx,jdbcType=VARCHAR}, #{cjrs,jdbcType=INTEGER}, 
+      #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=VARCHAR}, 
+      #{updateTime,jdbcType=TIMESTAMP}, #{updateUserid,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.ghsc.partybuild.model.PfJljyxxyhdFb">
+    insert into pf_jljyxxyhd_fb
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="jljyxxyhdId != null">
+        jljyxxyhd_id,
+      </if>
+      <if test="zdgz != null">
+        zdgz,
+      </if>
+      <if test="mc != null">
+        mc,
+      </if>
+      <if test="sj != null">
+        sj,
+      </if>
+      <if test="jydx != null">
+        jydx,
+      </if>
+      <if test="cjrs != null">
+        cjrs,
+      </if>
+      <if test="remark != null">
+        remark,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="createUserid != null">
+        create_userid,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+      <if test="updateUserid != null">
+        update_userid,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="jljyxxyhdId != null">
+        #{jljyxxyhdId,jdbcType=VARCHAR},
+      </if>
+      <if test="zdgz != null">
+        #{zdgz,jdbcType=VARCHAR},
+      </if>
+      <if test="mc != null">
+        #{mc,jdbcType=VARCHAR},
+      </if>
+      <if test="sj != null">
+        #{sj,jdbcType=VARCHAR},
+      </if>
+      <if test="jydx != null">
+        #{jydx,jdbcType=VARCHAR},
+      </if>
+      <if test="cjrs != null">
+        #{cjrs,jdbcType=INTEGER},
+      </if>
+      <if test="remark != null">
+        #{remark,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.PfJljyxxyhdFbExample" resultType="java.lang.Long">
+    select count(*) from pf_jljyxxyhd_fb
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update pf_jljyxxyhd_fb
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.jljyxxyhdId != null">
+        jljyxxyhd_id = #{record.jljyxxyhdId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.zdgz != null">
+        zdgz = #{record.zdgz,jdbcType=VARCHAR},
+      </if>
+      <if test="record.mc != null">
+        mc = #{record.mc,jdbcType=VARCHAR},
+      </if>
+      <if test="record.sj != null">
+        sj = #{record.sj,jdbcType=VARCHAR},
+      </if>
+      <if test="record.jydx != null">
+        jydx = #{record.jydx,jdbcType=VARCHAR},
+      </if>
+      <if test="record.cjrs != null">
+        cjrs = #{record.cjrs,jdbcType=INTEGER},
+      </if>
+      <if test="record.remark != null">
+        remark = #{record.remark,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.createUserid != null">
+        create_userid = #{record.createUserid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateTime != null">
+        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updateUserid != null">
+        update_userid = #{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_jljyxxyhd_fb
+    set id = #{record.id,jdbcType=VARCHAR},
+      jljyxxyhd_id = #{record.jljyxxyhdId,jdbcType=VARCHAR},
+      zdgz = #{record.zdgz,jdbcType=VARCHAR},
+      mc = #{record.mc,jdbcType=VARCHAR},
+      sj = #{record.sj,jdbcType=VARCHAR},
+      jydx = #{record.jydx,jdbcType=VARCHAR},
+      cjrs = #{record.cjrs,jdbcType=INTEGER},
+      remark = #{record.remark,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      create_userid = #{record.createUserid,jdbcType=VARCHAR},
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      update_userid = #{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.PfJljyxxyhdFb">
+    update pf_jljyxxyhd_fb
+    <set>
+      <if test="jljyxxyhdId != null">
+        jljyxxyhd_id = #{jljyxxyhdId,jdbcType=VARCHAR},
+      </if>
+      <if test="zdgz != null">
+        zdgz = #{zdgz,jdbcType=VARCHAR},
+      </if>
+      <if test="mc != null">
+        mc = #{mc,jdbcType=VARCHAR},
+      </if>
+      <if test="sj != null">
+        sj = #{sj,jdbcType=VARCHAR},
+      </if>
+      <if test="jydx != null">
+        jydx = #{jydx,jdbcType=VARCHAR},
+      </if>
+      <if test="cjrs != null">
+        cjrs = #{cjrs,jdbcType=INTEGER},
+      </if>
+      <if test="remark != null">
+        remark = #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createUserid != null">
+        create_userid = #{createUserid,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUserid != null">
+        update_userid = #{updateUserid,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ghsc.partybuild.model.PfJljyxxyhdFb">
+    update pf_jljyxxyhd_fb
+    set jljyxxyhd_id = #{jljyxxyhdId,jdbcType=VARCHAR},
+      zdgz = #{zdgz,jdbcType=VARCHAR},
+      mc = #{mc,jdbcType=VARCHAR},
+      sj = #{sj,jdbcType=VARCHAR},
+      jydx = #{jydx,jdbcType=VARCHAR},
+      cjrs = #{cjrs,jdbcType=INTEGER},
+      remark = #{remark,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      create_userid = #{createUserid,jdbcType=VARCHAR},
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      update_userid = #{updateUserid,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

src/main/resources/mapping/PfJljyxxyhdMapper.xml

@@ -0,0 +1,258 @@
+<?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.PfJljyxxyhdMapper">
+  <resultMap id="BaseResultMap" type="com.ghsc.partybuild.model.PfJljyxxyhd">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="dzzdm" jdbcType="VARCHAR" property="dzzdm" />
+    <result column="hdmc" jdbcType="VARCHAR" property="hdmc" />
+    <result column="rq" jdbcType="VARCHAR" property="rq" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="create_userid" jdbcType="VARCHAR" property="createUserid" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="update_userid" 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, dzzdm, hdmc, rq, create_time, create_userid, update_time, update_userid
+  </sql>
+  <select id="selectByExample" parameterType="com.ghsc.partybuild.model.PfJljyxxyhdExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from pf_jljyxxyhd
+    <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_jljyxxyhd
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from pf_jljyxxyhd
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ghsc.partybuild.model.PfJljyxxyhdExample">
+    delete from pf_jljyxxyhd
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ghsc.partybuild.model.PfJljyxxyhd">
+    insert into pf_jljyxxyhd (id, dzzdm, hdmc, 
+      rq, create_time, create_userid, 
+      update_time, update_userid)
+    values (#{id,jdbcType=VARCHAR}, #{dzzdm,jdbcType=VARCHAR}, #{hdmc,jdbcType=VARCHAR}, 
+      #{rq,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=VARCHAR}, 
+      #{updateTime,jdbcType=TIMESTAMP}, #{updateUserid,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.ghsc.partybuild.model.PfJljyxxyhd">
+    insert into pf_jljyxxyhd
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="dzzdm != null">
+        dzzdm,
+      </if>
+      <if test="hdmc != null">
+        hdmc,
+      </if>
+      <if test="rq != null">
+        rq,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="createUserid != null">
+        create_userid,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+      <if test="updateUserid != null">
+        update_userid,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="dzzdm != null">
+        #{dzzdm,jdbcType=VARCHAR},
+      </if>
+      <if test="hdmc != null">
+        #{hdmc,jdbcType=VARCHAR},
+      </if>
+      <if test="rq != null">
+        #{rq,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.PfJljyxxyhdExample" resultType="java.lang.Long">
+    select count(*) from pf_jljyxxyhd
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update pf_jljyxxyhd
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.dzzdm != null">
+        dzzdm = #{record.dzzdm,jdbcType=VARCHAR},
+      </if>
+      <if test="record.hdmc != null">
+        hdmc = #{record.hdmc,jdbcType=VARCHAR},
+      </if>
+      <if test="record.rq != null">
+        rq = #{record.rq,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.createUserid != null">
+        create_userid = #{record.createUserid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateTime != null">
+        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updateUserid != null">
+        update_userid = #{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_jljyxxyhd
+    set id = #{record.id,jdbcType=VARCHAR},
+      dzzdm = #{record.dzzdm,jdbcType=VARCHAR},
+      hdmc = #{record.hdmc,jdbcType=VARCHAR},
+      rq = #{record.rq,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      create_userid = #{record.createUserid,jdbcType=VARCHAR},
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      update_userid = #{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.PfJljyxxyhd">
+    update pf_jljyxxyhd
+    <set>
+      <if test="dzzdm != null">
+        dzzdm = #{dzzdm,jdbcType=VARCHAR},
+      </if>
+      <if test="hdmc != null">
+        hdmc = #{hdmc,jdbcType=VARCHAR},
+      </if>
+      <if test="rq != null">
+        rq = #{rq,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createUserid != null">
+        create_userid = #{createUserid,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUserid != null">
+        update_userid = #{updateUserid,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ghsc.partybuild.model.PfJljyxxyhd">
+    update pf_jljyxxyhd
+    set dzzdm = #{dzzdm,jdbcType=VARCHAR},
+      hdmc = #{hdmc,jdbcType=VARCHAR},
+      rq = #{rq,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      create_userid = #{createUserid,jdbcType=VARCHAR},
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      update_userid = #{updateUserid,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

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

@@ -3286,6 +3286,42 @@
                 load: ['$ocLazyLoad', function ($ocLazyLoad) {
                     return $ocLazyLoad.load('../main/partylife/djscgz/detail.js?' + window.sysVersion);
                 }]
+            }
+		 }).state("home.pf_jljyxxyhdList", {
+            url: "pf_jljyxxyhdList",
+            templateUrl: "../main/partylife/jljyxxyhd/list.html?" + window.sysVersion,
+            controller: "pf_jljyxxyhdListCtrl",
+            resolve: {
+                load: ['$ocLazyLoad', function ($ocLazyLoad) {
+                    return $ocLazyLoad.load('../main/partylife/jljyxxyhd/list.js?' + window.sysVersion);
+                }]
+            }
+        }).state("home.pf_jljyxxyhdEdit", {
+            url: "pf_jljyxxyhdEdit",
+            templateUrl: "../main/partylife/jljyxxyhd/edit.html?" + window.sysVersion,
+            controller: "pf_jljyxxyhdEditCtrl",
+            resolve: {
+                load: ['$ocLazyLoad', function ($ocLazyLoad) {
+                    return $ocLazyLoad.load('../main/partylife/jljyxxyhd/edit.js?' + window.sysVersion);
+                }]
+            }
+        }).state("home.pf_jljyxxyhdAdd", {
+            url: "pf_jljyxxyhdAdd",
+            templateUrl: "../main/partylife/jljyxxyhd/edit.html?" + window.sysVersion,
+            controller: "pf_jljyxxyhdEditCtrl",
+            resolve: {
+                load: ['$ocLazyLoad', function ($ocLazyLoad) {
+                    return $ocLazyLoad.load('../main/partylife/jljyxxyhd/edit.js?' + window.sysVersion);
+                }]
+            }
+        }).state("home.pf_jljyxxyhdDetail", {
+            url: "pf_jljyxxyhdDetail",
+            templateUrl: "../main/partylife/jljyxxyhd/detail.html?" + window.sysVersion,
+            controller: "pf_jljyxxyhdDetailCtrl",
+            resolve: {
+                load: ['$ocLazyLoad', function ($ocLazyLoad) {
+                    return $ocLazyLoad.load('../main/partylife/jljyxxyhd/detail.js?' + window.sysVersion);
+                }]
             }
         }).state("register", {
             url: "/register",
@@ -3799,16 +3835,7 @@
                     return $ocLazyLoad.load('../main/party/checkData/list.js?' + window.sysVersion);
                 }]
             }
-        }).state("home.checkScore", {
-            url: "checkScore",
-            templateUrl: "../main/party/checkScore/list.html?" + window.sysVersion,
-            controller: "checkScoreCtrl",
-            resolve: {
-                load: ['$ocLazyLoad', function ($ocLazyLoad) {
-                    return $ocLazyLoad.load('../main/party/checkScore/list.js?' + window.sysVersion);
-                }]
-            }
-        });
+        });;
 
         $bsRouterStateProvider.copyUrlState($stateProvider.getStates());
 

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

@@ -0,0 +1,81 @@
+<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.partyname}}</td>
+                            <th>会议名称</th>
+                            <td>{{dataModel.title}}</td>
+                            <th>会议时间</th>
+                            <td>{{dataModel.meetingdate | date:'yyyy-MM-dd'}}</td>
+                        </tr>
+                        <tr>
+                            <th>主持人</th>
+                            <td>{{dataModel.compere}}</td>
+                            <th>会议地址</th>
+                            <td colspan="3">{{dataModel.address}}</td>
+                        </tr>
+                        <tr>
+                            <th>“三重一大”类别</th>
+                            <td colspan="5">
+                                <div style="float: left;position: relative;display: inline-block;margin: 0px 0px 0px 5px;"
+                                     ng-repeat="it in scydTypeList">
+                                    <input type="checkbox" ng-model="it.checked" disabled
+                                           id="{{pageId}}_scydcheckbox_{{it.dickey}}"/>
+                                    <label for="{{pageId}}_scydcheckbox_{{it.dickey}}">{{it.dicvalue}}</label>
+                                </div>
+                            </td>
+                        </tr>
+                    </table>
+                </div>
+                <div class="dj-formtable">
+                    <div class="table-responsive list-table-panel">
+                        <div class="list-table-title">
+                            <div class="table-title">
+                                出席人员列表({{dataModel.personnellist.length}}人)
+                            </div>
+                        </div>
+                        <div class="outoflow" style="max-height: 300px;">
+                            <table class="table table-bordered table-striped table-hover js-basic-example dataTable text-nowrap">
+                                <thead>
+                                <tr>
+                                    <th>序号</th>
+                                    <th>姓名</th>
+                                    <th>是否缺勤</th>
+                                    <th>缺勤原因</th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                <tr ng-repeat="it in dataModel.personnellist">
+                                    <td scope="row">{{$index+1}}</td>
+                                    <td>{{it.xm}}</td>
+                                    <td>{{it.isabsenteeismname}}</td>
+                                    <td style="min-width: 150px !important;word-wrap: break-word;word-break: break-all;white-space: normal;">{{it.absenteeismcause}}</td>
+                                </tr>
+                                <tr ng-if="userList.length<=0">
+                                    <td colspan="7" style="text-align:center">暂无数据</td>
+                                </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+                </div>
+                <div class="dj-formtable">
+                    <table class="dj-table">
+                        <tr>
+                            <th style="width: 5%;">列席人员</th>
+                            <td colspan="5">{{dataModel.personnel}}</td>
+                        </tr>
+                        <tr>
+                            <th style="width: 5%;">会议主要议程及结果</th>
+                            <td colspan="5">{{dataModel.result}}</td>
+                        </tr>
+                    </table>
+                </div>
+            <bsfiles ng-model="reqFileModel"/>
+        </div>
+    </div>
+</div>

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

@@ -0,0 +1,37 @@
+(function ($app) {
+    $app.module('gtPartyApp').controller('pf_jljyxxyhdDetailCtrl', 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/jljyxxyhd/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/jljyxxyhd/edit.html

@@ -0,0 +1,137 @@
+<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>所属党组织<span style="color:red;">*</span></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>活动名称<span style="color:red;">*</span></th>
+                                <td ng-class="{ 'has-error' : this.editForm.hdmc.$invalid &&  this.editForm.$submitted}">
+                                    <input type="text" class="form-control" name="hdmc" autocomplete="off" autoclose="true"
+                                           ng-model="dataModel.hdmc" ng-required="true"/>
+                                    <span ng-show="this.editForm.hdmc.$invalid &&  this.editForm.$submitted"
+                                          class="error">必填.</span>
+                                </td>
+                                <th>日期<span style="color:red;">*</span></th>
+                                <td ng-class="{ 'has-error' : this.editForm.rq.$invalid &&  this.editForm.$submitted}">
+                                    <input name="rq" class="form-control"
+                                           autocomplete="off" autoclose="true"
+                                           data-date-format="yyyyMM" data-date-type="string"
+                                           data-min-view="1" data-start-view="1"
+                                           ng-model="dataModel.rq"
+                                           placeholder="" bs-datepicker ng-required="true"/>
+                                    <span ng-show="this.editForm.rq.$invalid &&  this.editForm.$submitted"
+                                          class="error">必填.</span>
+                                </td>
+                            </tr>
+                        </table>
+                    </div>
+                    <div class="dj-formtable">
+                        <div class="table-responsive list-table-panel">
+                            <div class="list-table-title">
+                                <div class="table-title">
+                                    统计明细表({{dataModel.fblist.length}}人)
+                                </div>
+                                <div class="table-tool">
+                                    <button type="button" class="btn btn-primary dropdown-toggle"
+                                            title="新增" ng-click="addUser()">
+                                        新增
+                                    </button>
+                                    <button type="button" class="btn btn-primary dropdown-toggle"
+                                            title="导入" ng-click="importUser()">
+                                        导入
+                                    </button>
+                                </div>
+                            </div>
+                            <div class="outoflow" style="max-height: 300px;">
+                                <table class="table table-bordered">
+                                    <thead>
+                                    <tr>
+                                        <th>序号</th>
+                                        <th>重点工作</th>
+                                        <th>名称</th>
+                                        <th>时间</th>
+                                        <th>教育对象</th>
+                                        <th>参加人数</th>
+                                        <th>备注</th>
+                                        <th>操作</th>
+                                    </tr>
+                                    </thead>
+                                    <tbody>
+                                    <tr ng-repeat="it in dataModel.fblist">
+                                        <td scope="row">{{$index+1}}</td>
+                                        <td ng-class="{ 'has-error' : invalidFee($index, editForm, 'zdgz') &&  this.editForm.$submitted}">
+                                            <input type="text" class="form-control" name="zdgz_{{$index}}" autocomplete="off" autoclose="true"
+                                                   ng-model="it.zdgz" ng-required="true"/>
+                                            <span ng-show="invalidFee($index, editForm, 'zdgz') &&  this.editForm.$submitted"
+                                                  style="color: red;">必填.</span>
+                                        </td>
+                                        <td ng-class="{ 'has-error' : invalidFee($index, editForm, 'mc') &&  this.editForm.$submitted}">
+                                            <input type="text" class="form-control" name="mc_{{$index}}" autocomplete="off" autoclose="true"
+                                                   ng-model="it.mc" ng-required="true"/>
+                                            <span ng-show="invalidFee($index, editForm, 'mc') &&  this.editForm.$submitted"
+                                                  style="color: red;">必填.</span>
+                                        </td>
+                                        <td ng-class="{ 'has-error' : invalidFee($index, editForm, 'sj') &&  this.editForm.$submitted}">
+                                            <input name="sj_{{$index}}" class="form-control"
+                                                   autocomplete="off" autoclose="true"
+                                                   data-date-format="yyyy-MM-dd" data-date-type="string"
+                                                   ng-model="it.sj"
+                                                   placeholder="" bs-datetimepicker ng-required="true"/>
+                                            <span ng-show="invalidFee($index, editForm, 'sj') &&  this.editForm.$submitted"
+                                                  style="color: red;">必填.</span>
+                                        </td>
+                                        <td ng-class="{ 'has-error' : invalidFee($index, editForm, 'jydx') &&  this.editForm.$submitted}">
+                                            <input type="text" class="form-control" name="jydx_{{$index}}" autocomplete="off" autoclose="true"
+                                                   ng-model="it.jydx" ng-required="true"/>
+                                            <span ng-show="invalidFee($index, editForm, 'jydx') &&  this.editForm.$submitted"
+                                                  style="color: red;">必填.</span>
+                                        </td>
+                                        <td ng-class="{ 'has-error' : invalidFee($index, editForm, 'cjrs') &&  this.editForm.$submitted}">
+                                            <input type="number" class="form-control" name="cjrs_{{$index}}" autocomplete="off" autoclose="true"
+                                                   ng-model="it.cjrs" ng-required="true"/>
+                                            <span ng-show="invalidFee($index, editForm, 'cjrs') &&  this.editForm.$submitted"
+                                                  style="color: red;">必填.</span>
+                                        </td>
+                                        <td>
+                                            <textarea name="remark" ng-model="it.remark"
+                                                      class="form-control" rows="3"></textarea>
+                                        </td>
+                                        <td class="text-center">
+                                            <button type="button" class="btn td-btn bg-pink waves-effect"
+                                                    ng-click="deleteUser($index)" title="删除">
+                                                删除
+                                            </button>
+                                        </td>
+                                    </tr>
+                                    <tr ng-if="dataModel.fblist.length<=0">
+                                        <td colspan="8" style="text-align:center">暂无数据</td>
+                                    </tr>
+                                    </tbody>
+                                </table>
+                            </div>
+                        </div>
+                    </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/jljyxxyhd/edit.js

@@ -0,0 +1,197 @@
+(function ($app) {
+    $app.module('gtPartyApp').controller('pf_jljyxxyhdEditCtrl', 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.getUserList();
+                $scope.partyConfig.selectedText = "";
+                $scope.partyConfig.selectedKey = "";
+            }
+        }, true);
+        $scope.selectParty = function () {
+            $partySelect.showModal();
+        };
+
+        //选择会议成员
+        $scope.selectUserlist = {
+            url: "../../api/partyUser/getPartyUserList",
+            title: '人员选择',
+            isMulti: true,
+            selectData: {xm: '姓名', szdzb: '所在组织架构'},
+            columns: {XM: '姓名', XBMC: '性别', JG: '籍贯', DZZMC: '所在组织架构'},
+            selectLabelKey: 'XM',
+            selectValuekey: 'RYJBXXBS',
+            selectedValueData: '',
+            selectedLabeData: '',
+            selectedJData: [],
+            selectParams: {
+                dzzdm: $scope.dataModel.partycode,
+                removeUsers: '',
+                //szdzbdm: $scope.dataModel.shyktype == 2 ? $scope.dataModel.partycode : '',
+                ryzt: '2,3' //预备党员，正式党员
+            }
+        };
+        $scope.$watch('selectUserlist.selectedValueData', function (newVal) {
+            if (newVal != '' && newVal != undefined) {
+                $http({
+                    method: 'get',
+                    url: '../../api/partyUser/getPartyUserList',
+                    params: {
+                        userIds: newVal,
+                        pageindex: 1,
+                        pagesize: 10000
+                    }
+                }).then(function (result) {
+                    $loading.hide();
+                    result.data.item.list.forEach(item => {
+                        item.SIGNINSTATUS = 2;
+                    });
+                    let data = [];
+                    result.data.item.list.forEach(x=>{
+                        data.push({rybm: x.RYBM, ryjbxxbs: x.RYJBXXBS, xm: x.XM, isabsenteeism: 0, absenteeismcause: ''});
+                    })
+                    $scope.dataModel.fblist = $scope.dataModel.fblist.concat(data);
+
+                    $scope.selectUserlist.selectedValueData = "";
+                    $scope.selectUserlist.selectedLabeData = "";
+                }, function (resp) {
+                    $loading.hide();
+                    $scope.showMsg('错误', '服务器错误');
+                });
+            }
+        });
+
+        $scope.invalidFee = function (index, form1, name) {
+            name = name + "_" + index;
+            eval('var i=form1.' + name + '.$invalid');
+            return i;
+        };
+
+        $scope.importUser = function () {
+            $scope.excelConfig = {
+                filetype: 1,
+                columns: {
+                    '重点工作': 'zdgz',
+                    '名称': 'mc',
+                    '时间': 'sj',
+                    '教育对象': 'jydx',
+                    '参加人数': 'cjrs',
+                    '备注': 'remark'
+                },
+                errorcolumns: {
+                    'zdgz': '重点工作',
+                    'mc': '名称',
+                    'sj': '时间',
+                    'cjrs': '参加人数',
+                    'errorInfo': '错误信息'
+                },
+                readonly: false,
+                templateUrl: '/doc/template/纪律教育学习月活动统计明细表导入模板.xlsx'
+            };
+            $excel.addFile($scope.excelConfig).then(function (items) {
+                let errors = [];
+                let fblist = [];
+                items.forEach(item => {
+                    if($scope.dataModel.fblist.findIndex(x=> x.zdgz==item.zdgz && x.mc==item.mc)<0){
+                        fblist.push({zdgz : item.zdgz, mc : item.mc, sj : item.sj, jydx : item.jydx, cjrs : parseInt(item.cjrs), remark : item.remark});
+                    }else{
+                        errors.push({zdgz : item.zdgz, mc : item.mc, sj : item.sj, jydx : item.jydx, cjrs : parseInt(item.cjrs), errorInfo : '已录入！'})
+                    }
+                })
+
+                if(errors.length>0){
+                    $excel.showErrorInfo(errors);
+                }else{
+                    fblist.forEach(item => {
+                        $scope.dataModel.fblist.push(item);
+                    })
+                }
+            });
+        };
+
+        $scope.addUser = function () {
+            $scope.dataModel.fblist.push({zdgz : '', mc : '', sj : null, jydx : '', cjrs : null, remark : ''});
+        };
+
+        $scope.deleteUser = function (index) {
+            if (confirm("请确认是否需要移除参会人员！")) {
+                $scope.dataModel.fblist.splice(index, 1);
+            }
+        };
+
+        $scope.getData = function () {
+            $http
+            ({
+                method: 'get', url: "../../api/partylife/jljyxxyhd/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/jljyxxyhd/save",
+                    data: $scope.dataModel
+                }).then(function (result) {
+                    $loading.hide();
+                    if (result.data.success) {
+                        $scope.showMsg('成功', "操作成功");
+                        $scope.pagechange();
+                        //重新刷新列表
+                        $scope.$emit("tabReloadData", {name: 'pf_jljyxxyhdListCtrl', 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/jljyxxyhd/list.html

@@ -0,0 +1,173 @@
+<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="hdmc" class="form-control" type="text"
+                                                       ng-keypress="($event.which === 13)?search():0"
+                                                       ng-model="selectparams.hdmc"
+                                                       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="startDate" class="form-control fm-ct-first"
+                                                       autocomplete="off"
+                                                       autoclose="true"
+                                                       data-date-format="yyyyMM" 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="yyyyMM" data-date-type="string"
+                                                       ng-model="selectparams.endDate"
+                                                       ng-change="search()"
+                                                       placeholder="" bs-datepicker/>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </form>
+                        </div>
+                        <div class="search-btn" style="margin-right: 20px;">
+                            <div style="min-width: 13em">
+                                <button class="btn btn-default1"
+                                        ng-click="search()">查询
+                                </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>
+                                </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.hdmc}}</td>
+                                    <td>{{it.rq}}</td>
+                                    <td>{{it.createUsername}}</td>
+                                    <td>{{it.createTime | date:'yyyy-MM-dd'}}</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/jljyxxyhd/list.js

@@ -0,0 +1,156 @@
+(function ($app) {
+    $app.module('gtPartyApp').controller('pf_jljyxxyhdListCtrl', function ($scope, $http, $modal, $ocLazyLoad, $alert, $loading, $state, $bsRouterState, AuthUser, $timeout, $excel, $partySelect, $filter) {
+        $scope.isAll = false;
+        $scope.pageId = "jljyxxyhdList";
+        $scope.tabNameAdd = "home.pf_jljyxxyhdAdd";
+        $scope.tabNameEdit = "home.pf_jljyxxyhdEdit";
+        $scope.tabNameDetail = "home.pf_jljyxxyhdDetail";
+
+        //定义数据集合
+        $scope.dataList = []; //列表数据
+        //组织树参数
+        $scope.treeparams = {
+            isunfold: false,//组织结构树展开收缩
+            selectdzzdm: "",
+            selectdzzmc: "",
+            defaultselected: $state.params.dzzdm
+        };
+        //查询条件
+        $scope.selectparams = {
+            pageindex: 1,
+            pagesize: 10,
+            dzzdm: '',
+            hdmc: '',
+            startDate: null,
+            endDate: null
+        };
+        $scope.pageInfo = {ptotal: 0};
+
+        $scope.$on('tabChildReloadData', function (event, data) {
+            if (data.name == 'pf_jljyxxyhdListCtrl') {
+                $scope.loadData();
+            }
+        });
+
+        //加载列表数据
+        $scope.loadData = function () {
+            $http
+            ({
+                method: 'get', url: '../../api/partylife/jljyxxyhd/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/jljyxxyhd/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/jljyxxyhd/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.loadData();
+    });
+})(angular);

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

@@ -116,7 +116,7 @@
                                             </button>
                                         </td>
                                     </tr>
-                                    <tr ng-if="personnellist.length<=0">
+                                    <tr ng-if="dataModel.personnellist.length<=0">
                                         <td colspan="7" style="text-align:center">暂无数据</td>
                                     </tr>
                                     </tbody>

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

@@ -127,7 +127,7 @@
                                             </button>
                                         </td>
                                     </tr>
-                                    <tr ng-if="userList.length<=0">
+                                    <tr ng-if="dataModel.personnellist.length<=0">
                                         <td colspan="7" style="text-align:center">暂无数据</td>
                                     </tr>
                                     </tbody>