2025-07-17 规范建设 V3

qianhe-ydsj/src/main/java/com/qianhe/controller/SjGfjsJcdwkhpjController.java

@@ -112,10 +112,10 @@ public class SjGfjsJcdwkhpjController extends BaseController
             endRq=nd+"-03";
         }else if("第二季度".equals(zqfw)) {
             startRq=nd+"-04";
-            endRq=nd+"-6";
+            endRq=nd+"-06";
         }else if("第三季度".equals(zqfw)) {
             startRq=nd+"-07";
-            endRq=nd+"-9";
+            endRq=nd+"-09";
         }else {
             startRq=nd+"-10";
             endRq=nd+"-12";
@@ -147,7 +147,8 @@ public class SjGfjsJcdwkhpjController extends BaseController
 
             //先保存再查询
             SjGfjsZdgz sjGfjsZdgz=new SjGfjsZdgz();
-            sjGfjsZdgz.setLx(deptLx);
+//            sjGfjsZdgz.setLx(deptLx);
+            sjGfjsZdgz.setLx("基础");
             sjGfjsZdgz.setNd(nd);
             List<SjGfjsZdgzCb> sjGfjsZdgzList=sjGfjsZdgzMapper.selectSjGfjsZdgzCxBzList(sjGfjsZdgz);
             List<SjGfjsZsdwkhpj> addList=new ArrayList<>();
@@ -173,7 +174,7 @@ public class SjGfjsJcdwkhpjController extends BaseController
                 zsdwkhpj.setJb("基层单位");
                 zsdwkhpj.setZbId(sjGfjsZsdwkhpjZbnew.getId());
                 zsdwkhpj.setYl1(i+1L);
-                zsdwkhpj.setKhfz("-0");
+                zsdwkhpj.setKhfz("A");
                 //计算问题
                 List<String> collect = sjGfjsZsdwwtcjs.stream().filter(item -> item.getPjbzid().equals(zsdwkhpj.getPjbzid()))
                         .map(SjGfjsZsdwwtcj::getWtmc).collect(Collectors.toList());

qianhe-ydsj/src/main/java/com/qianhe/domain/SjGfjsZsdwfjxcj.java

+package com.qianhe.domain;
+
+import com.qianhe.common.annotation.Excel;
+import com.qianhe.common.core.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * 规范建设-直属单位否决项采集对象 sj_zdbf_zsdwfjxcj
+ *
+ * @author qianhe
+ * @date 2024-07-24
+ */
+@Data
+public class SjGfjsZsdwfjxcj extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 单位id */
+    @Excel(name = "单位id")
+    private Long deptId;
+
+    /** 日期 */
+    @Excel(name = "日期")
+    private String rq;
+
+    /** 分类名称 */
+    @Excel(name = "分类名称")
+    private String flmc;
+
+    /** 评价标准id */
+    @Excel(name = "评价标准id")
+    private String pjbzid;
+
+    /** 评价标准名称 */
+    @Excel(name = "评价标准名称")
+    private String pjbzmc;
+
+    /** 问题描述 */
+    @Excel(name = "问题描述")
+    private String wtmc;
+
+    /** 预留1 */
+    @Excel(name = "预留1")
+    private String yl1;
+
+    /** 预留2 */
+    @Excel(name = "预留2")
+    private String yl2;
+
+    /** 预留3 */
+    @Excel(name = "预留3")
+    private Long yl3;
+
+    /** 预留4 */
+    @Excel(name = "预留4")
+    private String yl4;
+
+    /** 预留5 */
+    @Excel(name = "预留5")
+    private String yl5;
+
+
+    private String deptName;
+
+    private String startRq;
+    private String endRq;
+
+    private String deptLx;
+
+    private String yl3name;
+
+
+}

qianhe-ydsj/src/main/java/com/qianhe/domain/SjGfjsZsdwkhpjfjx.java

+package com.qianhe.domain;
+
+import com.qianhe.common.annotation.Excel;
+import com.qianhe.common.core.domain.BaseEntity;
+import lombok.Data;
+import org.apache.poi.ss.usermodel.IndexedColors;
+
+/**
+ * 规范建设-直属单位考核评价否决项对象 sj_gfjs_zsdwkhpjfjx
+ *
+ * @author qianhe
+ * @date 2024-07-24
+ */
+@Data
+public class SjGfjsZsdwkhpjfjx extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+
+    @Excel(name = "单位名称）")
+    private String deptName;
+    /** 年度 */
+    @Excel(name = "年度")
+    private String nd;
+
+    /** 周期范围（第一季度-第四季度、上半年、下半年） */
+    @Excel(name = "周期范围")
+    private String zqfw;
+
+    /** 周期类型（季度、半年度、年度） */
+//    @Excel(name = "周期类型", readConverterExp = "季=度、半年度、年度")
+    private String zqlx;
+
+    /** 级别（直属单位（半年度）、基层单位（季度）、三基帮扶组（年度）） */
+//    @Excel(name = "级别", readConverterExp = "直=属单位（半年度")
+    private String jb;
+
+    /** 分类名称 */
+    @Excel(name = "分类名称")
+    private String flmc;
+
+
+    /** 评价标准名称 */
+    @Excel(name = "评价标准")
+    private String pjbzmc;
+
+    /** 是否发生 */
+    @Excel(name = "是否发生")
+    private String sffs;
+
+    /** 问题描述 */
+    @Excel(name = "问题描述")
+    private String wtms;
+
+    /** 预留1 */
+//    @Excel(name = "预留1")
+    private Long yl1;
+
+    /** 预留2 */
+//    @Excel(name = "预留2")
+    private String yl2;
+
+    /** 预留3 */
+//    @Excel(name = "预留3")
+    private String yl3;
+
+    /** 预留4 */
+//    @Excel(name = "预留4")
+    private String yl4;
+
+    /** 预留5 */
+//    @Excel(name = "预留5")
+    private String yl5;
+
+
+
+    /** 主键 */
+    @Excel(name = "id（勿动）",headerColor = IndexedColors.RED1)
+    private Long id;
+
+    /** 主表id */
+    @Excel(name = "主表id（勿动）",headerColor = IndexedColors.RED1)
+    private Long zbId;
+
+    /** 单位id */
+    @Excel(name = "单位id（勿动）",headerColor = IndexedColors.RED1)
+    private Long deptId;
+    /** 评价标准id */
+    @Excel(name = "评价标准id")
+    private String pjbzid;
+
+}

qianhe-ydsj/src/main/java/com/qianhe/mapper/SjGfjsJgbmjcMapper.java

+package com.qianhe.mapper;
+
+import com.qianhe.domain.SjGfjsZsdwwtcj;
+
+import java.util.List;
+
+/**
+ * 规范建设-机关部门检查Mapper接口
+ *
+ * @author qianhe
+ * @date 2024-07-23
+ */
+public interface SjGfjsJgbmjcMapper
+{
+    /**
+     * 查询规范建设-机关部门检查
+     *
+     * @param id 规范建设-机关部门检查主键
+     * @return 规范建设-机关部门检查
+     */
+    public SjGfjsZsdwwtcj selectSjGfjsZsdwwtcjById(Long id);
+
+    /**
+     * 查询规范建设-机关部门检查列表
+     *
+     * @param sjGfjsZsdwwtcj 规范建设-机关部门检查
+     * @return 规范建设-机关部门检查集合
+     */
+    public List<SjGfjsZsdwwtcj> selectSjGfjsZsdwwtcjList(SjGfjsZsdwwtcj sjGfjsZsdwwtcj);
+
+    /**
+     * 新增规范建设-机关部门检查
+     *
+     * @param sjGfjsZsdwwtcj 规范建设-机关部门检查
+     * @return 结果
+     */
+    public int insertSjGfjsZsdwwtcj(SjGfjsZsdwwtcj sjGfjsZsdwwtcj);
+
+    /**
+     * 修改规范建设-机关部门检查
+     *
+     * @param sjGfjsZsdwwtcj 规范建设-机关部门检查
+     * @return 结果
+     */
+    public int updateSjGfjsZsdwwtcj(SjGfjsZsdwwtcj sjGfjsZsdwwtcj);
+
+    /**
+     * 删除规范建设-机关部门检查
+     *
+     * @param id 规范建设-机关部门检查主键
+     * @return 结果
+     */
+    public int deleteSjGfjsZsdwwtcjById(Long id);
+
+    /**
+     * 批量删除规范建设-机关部门检查
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSjGfjsZsdwwtcjByIds(Long[] ids);
+
+    int batchSave(List<SjGfjsZsdwwtcj> list);
+
+
+}

qianhe-ydsj/src/main/java/com/qianhe/mapper/SjGfjsZsdwfjxcjMapper.java

+package com.qianhe.mapper;
+
+import com.qianhe.domain.SjGfjsZsdwfjxcj;
+
+import java.util.List;
+
+/**
+ * 规范建设-直属单位否决项采集Mapper接口
+ * 
+ * @author qianhe
+ * @date 2024-07-24
+ */
+public interface SjGfjsZsdwfjxcjMapper
+{
+    /**
+     * 查询规范建设-直属单位否决项采集
+     * 
+     * @param id 规范建设-直属单位否决项采集主键
+     * @return 规范建设-直属单位否决项采集
+     */
+    public SjGfjsZsdwfjxcj selectSjGfjsZsdwfjxcjById(Long id);
+
+    /**
+     * 查询规范建设-直属单位否决项采集列表
+     * 
+     * @param sjGfjsZsdwfjxcj 规范建设-直属单位否决项采集
+     * @return 规范建设-直属单位否决项采集集合
+     */
+    public List<SjGfjsZsdwfjxcj> selectSjGfjsZsdwfjxcjList(SjGfjsZsdwfjxcj sjGfjsZsdwfjxcj);
+
+    /**
+     * 新增规范建设-直属单位否决项采集
+     * 
+     * @param sjGfjsZsdwfjxcj 规范建设-直属单位否决项采集
+     * @return 结果
+     */
+    public int insertSjGfjsZsdwfjxcj(SjGfjsZsdwfjxcj sjGfjsZsdwfjxcj);
+
+    /**
+     * 修改规范建设-直属单位否决项采集
+     * 
+     * @param sjGfjsZsdwfjxcj 规范建设-直属单位否决项采集
+     * @return 结果
+     */
+    public int updateSjGfjsZsdwfjxcj(SjGfjsZsdwfjxcj sjGfjsZsdwfjxcj);
+
+    /**
+     * 删除规范建设-直属单位否决项采集
+     * 
+     * @param id 规范建设-直属单位否决项采集主键
+     * @return 结果
+     */
+    public int deleteSjGfjsZsdwfjxcjById(Long id);
+
+    /**
+     * 批量删除规范建设-直属单位否决项采集
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSjGfjsZsdwfjxcjByIds(Long[] ids);
+
+
+    int batchSave(List<SjGfjsZsdwfjxcj> list);
+
+
+}

qianhe-ydsj/src/main/java/com/qianhe/mapper/SjGfjsZsdwkhpjfjxMapper.java

+package com.qianhe.mapper;
+
+import com.qianhe.domain.SjGfjsZsdwkhpjfjx;
+
+import java.util.List;
+
+/**
+ * 规范建设-直属单位考核评价否决项Mapper接口
+ * 
+ * @author qianhe
+ * @date 2024-07-24
+ */
+public interface SjGfjsZsdwkhpjfjxMapper
+{
+    /**
+     * 查询规范建设-直属单位考核评价否决项
+     * 
+     * @param id 规范建设-直属单位考核评价否决项主键
+     * @return 规范建设-直属单位考核评价否决项
+     */
+    public SjGfjsZsdwkhpjfjx selectSjGfjsZsdwkhpjfjxById(Long id);
+
+    /**
+     * 查询规范建设-直属单位考核评价否决项列表
+     * 
+     * @param sjGfjsZsdwkhpjfjx 规范建设-直属单位考核评价否决项
+     * @return 规范建设-直属单位考核评价否决项集合
+     */
+    public List<SjGfjsZsdwkhpjfjx> selectSjGfjsZsdwkhpjfjxList(SjGfjsZsdwkhpjfjx sjGfjsZsdwkhpjfjx);
+
+    /**
+     * 新增规范建设-直属单位考核评价否决项
+     * 
+     * @param sjGfjsZsdwkhpjfjx 规范建设-直属单位考核评价否决项
+     * @return 结果
+     */
+    public int insertSjGfjsZsdwkhpjfjx(SjGfjsZsdwkhpjfjx sjGfjsZsdwkhpjfjx);
+
+    /**
+     * 修改规范建设-直属单位考核评价否决项
+     * 
+     * @param sjGfjsZsdwkhpjfjx 规范建设-直属单位考核评价否决项
+     * @return 结果
+     */
+    public int updateSjGfjsZsdwkhpjfjx(SjGfjsZsdwkhpjfjx sjGfjsZsdwkhpjfjx);
+
+    /**
+     * 删除规范建设-直属单位考核评价否决项
+     * 
+     * @param id 规范建设-直属单位考核评价否决项主键
+     * @return 结果
+     */
+    public int deleteSjGfjsZsdwkhpjfjxById(Long id);
+
+    /**
+     * 批量删除规范建设-直属单位考核评价否决项
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSjGfjsZsdwkhpjfjxByIds(Long[] ids);
+
+    int batchSave(List<SjGfjsZsdwkhpjfjx> fjxList);
+
+    int pledit(List<SjGfjsZsdwkhpjfjx> list);
+
+}

qianhe-ydsj/src/main/java/com/qianhe/service/ISjGfjsJgbmjcService.java

+package com.qianhe.service;
+
+import com.qianhe.domain.SjGfjsZsdwwtcj;
+
+import java.util.List;
+
+/**
+ * 规范建设-机关部门检查Service接口
+ *
+ * @author qianhe
+ * @date 2024-07-23
+ */
+public interface ISjGfjsJgbmjcService
+{
+    /**
+     * 查询规范建设-机关部门检查
+     *
+     * @param id 规范建设-机关部门检查主键
+     * @return 规范建设-机关部门检查
+     */
+    public SjGfjsZsdwwtcj selectSjGfjsZsdwwtcjById(Long id);
+
+    /**
+     * 查询规范建设-机关部门检查列表
+     *
+     * @param sjGfjsZsdwwtcj 规范建设-机关部门检查
+     * @return 规范建设-机关部门检查集合
+     */
+    public List<SjGfjsZsdwwtcj> selectSjGfjsZsdwwtcjList(SjGfjsZsdwwtcj sjGfjsZsdwwtcj);
+
+    /**
+     * 新增规范建设-机关部门检查
+     *
+     * @param sjGfjsZsdwwtcj 规范建设-机关部门检查
+     * @return 结果
+     */
+    public int insertSjGfjsZsdwwtcj(SjGfjsZsdwwtcj sjGfjsZsdwwtcj);
+
+    /**
+     * 修改规范建设-机关部门检查
+     *
+     * @param sjGfjsZsdwwtcj 规范建设-机关部门检查
+     * @return 结果
+     */
+    public int updateSjGfjsZsdwwtcj(SjGfjsZsdwwtcj sjGfjsZsdwwtcj);
+
+    /**
+     * 批量删除规范建设-机关部门检查
+     *
+     * @param ids 需要删除的规范建设-机关部门检查主键集合
+     * @return 结果
+     */
+    public int deleteSjGfjsZsdwwtcjByIds(Long[] ids);
+
+    /**
+     * 删除规范建设-机关部门检查信息
+     *
+     * @param id 规范建设-机关部门检查主键
+     * @return 结果
+     */
+    public int deleteSjGfjsZsdwwtcjById(Long id);
+
+    int batchSave(List<SjGfjsZsdwwtcj> list);
+
+}

qianhe-ydsj/src/main/java/com/qianhe/service/ISjGfjsZsdwfjxcjService.java

+package com.qianhe.service;
+
+import com.qianhe.domain.SjGfjsZsdwfjxcj;
+
+import java.util.List;
+
+/**
+ * 规范建设-直属单位否决项采集Service接口
+ * 
+ * @author qianhe
+ * @date 2024-07-24
+ */
+public interface ISjGfjsZsdwfjxcjService
+{
+    /**
+     * 查询规范建设-直属单位否决项采集
+     * 
+     * @param id 规范建设-直属单位否决项采集主键
+     * @return 规范建设-直属单位否决项采集
+     */
+    public SjGfjsZsdwfjxcj selectSjGfjsZsdwfjxcjById(Long id);
+
+    /**
+     * 查询规范建设-直属单位否决项采集列表
+     * 
+     * @param sjGfjsZsdwfjxcj 规范建设-直属单位否决项采集
+     * @return 规范建设-直属单位否决项采集集合
+     */
+    public List<SjGfjsZsdwfjxcj> selectSjGfjsZsdwfjxcjList(SjGfjsZsdwfjxcj sjGfjsZsdwfjxcj);
+
+    /**
+     * 新增规范建设-直属单位否决项采集
+     * 
+     * @param sjGfjsZsdwfjxcj 规范建设-直属单位否决项采集
+     * @return 结果
+     */
+    public int insertSjGfjsZsdwfjxcj(SjGfjsZsdwfjxcj sjGfjsZsdwfjxcj);
+
+    /**
+     * 修改规范建设-直属单位否决项采集
+     * 
+     * @param sjGfjsZsdwfjxcj 规范建设-直属单位否决项采集
+     * @return 结果
+     */
+    public int updateSjGfjsZsdwfjxcj(SjGfjsZsdwfjxcj sjGfjsZsdwfjxcj);
+
+    /**
+     * 批量删除规范建设-直属单位否决项采集
+     * 
+     * @param ids 需要删除的规范建设-直属单位否决项采集主键集合
+     * @return 结果
+     */
+    public int deleteSjGfjsZsdwfjxcjByIds(Long[] ids);
+
+    /**
+     * 删除规范建设-直属单位否决项采集信息
+     * 
+     * @param id 规范建设-直属单位否决项采集主键
+     * @return 结果
+     */
+    public int deleteSjGfjsZsdwfjxcjById(Long id);
+
+    int batchSave(List<SjGfjsZsdwfjxcj> list);
+
+}

qianhe-ydsj/src/main/java/com/qianhe/service/ISjGfjsZsdwkhpjService.java

+package com.qianhe.service;
+
+import com.qianhe.domain.SjGfjsZsdwkhpj;
+
+import java.util.List;
+
+/**
+ * 规范建设-直属单位考核评价Service接口
+ * 
+ * @author qianhe
+ * @date 2024-07-24
+ */
+public interface ISjGfjsZsdwkhpjService
+{
+    /**
+     * 查询规范建设-直属单位考核评价
+     * 
+     * @param id 规范建设-直属单位考核评价主键
+     * @return 规范建设-直属单位考核评价
+     */
+    public SjGfjsZsdwkhpj selectSjGfjsZsdwkhpjById(Long id);
+
+    /**
+     * 查询规范建设-直属单位考核评价列表
+     * 
+     * @param sjGfjsZsdwkhpj 规范建设-直属单位考核评价
+     * @return 规范建设-直属单位考核评价集合
+     */
+    public List<SjGfjsZsdwkhpj> selectSjGfjsZsdwkhpjList(SjGfjsZsdwkhpj sjGfjsZsdwkhpj);
+
+    /**
+     * 新增规范建设-直属单位考核评价
+     * 
+     * @param sjGfjsZsdwkhpj 规范建设-直属单位考核评价
+     * @return 结果
+     */
+    public int insertSjGfjsZsdwkhpj(SjGfjsZsdwkhpj sjGfjsZsdwkhpj);
+
+    /**
+     * 修改规范建设-直属单位考核评价
+     * 
+     * @param sjGfjsZsdwkhpj 规范建设-直属单位考核评价
+     * @return 结果
+     */
+    public int updateSjGfjsZsdwkhpj(SjGfjsZsdwkhpj sjGfjsZsdwkhpj);
+
+    /**
+     * 批量删除规范建设-直属单位考核评价
+     * 
+     * @param ids 需要删除的规范建设-直属单位考核评价主键集合
+     * @return 结果
+     */
+    public int deleteSjGfjsZsdwkhpjByIds(Long[] ids);
+
+    /**
+     * 删除规范建设-直属单位考核评价信息
+     * 
+     * @param id 规范建设-直属单位考核评价主键
+     * @return 结果
+     */
+    public int deleteSjGfjsZsdwkhpjById(Long id);
+
+    int batchSave(List<SjGfjsZsdwkhpj> addList);
+
+    int pledit(List<SjGfjsZsdwkhpj> list);
+
+}

qianhe-ydsj/src/main/java/com/qianhe/service/ISjGfjsZsdwkhpjfjxService.java

+package com.qianhe.service;
+
+import com.qianhe.domain.SjGfjsZsdwkhpjfjx;
+
+import java.util.List;
+
+/**
+ * 规范建设-直属单位考核评价否决项Service接口
+ * 
+ * @author qianhe
+ * @date 2024-07-24
+ */
+public interface ISjGfjsZsdwkhpjfjxService
+{
+    /**
+     * 查询规范建设-直属单位考核评价否决项
+     * 
+     * @param id 规范建设-直属单位考核评价否决项主键
+     * @return 规范建设-直属单位考核评价否决项
+     */
+    public SjGfjsZsdwkhpjfjx selectSjGfjsZsdwkhpjfjxById(Long id);
+
+    /**
+     * 查询规范建设-直属单位考核评价否决项列表
+     * 
+     * @param sjGfjsZsdwkhpjfjx 规范建设-直属单位考核评价否决项
+     * @return 规范建设-直属单位考核评价否决项集合
+     */
+    public List<SjGfjsZsdwkhpjfjx> selectSjGfjsZsdwkhpjfjxList(SjGfjsZsdwkhpjfjx sjGfjsZsdwkhpjfjx);
+
+    /**
+     * 新增规范建设-直属单位考核评价否决项
+     * 
+     * @param sjGfjsZsdwkhpjfjx 规范建设-直属单位考核评价否决项
+     * @return 结果
+     */
+    public int insertSjGfjsZsdwkhpjfjx(SjGfjsZsdwkhpjfjx sjGfjsZsdwkhpjfjx);
+
+    /**
+     * 修改规范建设-直属单位考核评价否决项
+     * 
+     * @param sjGfjsZsdwkhpjfjx 规范建设-直属单位考核评价否决项
+     * @return 结果
+     */
+    public int updateSjGfjsZsdwkhpjfjx(SjGfjsZsdwkhpjfjx sjGfjsZsdwkhpjfjx);
+
+    /**
+     * 批量删除规范建设-直属单位考核评价否决项
+     * 
+     * @param ids 需要删除的规范建设-直属单位考核评价否决项主键集合
+     * @return 结果
+     */
+    public int deleteSjGfjsZsdwkhpjfjxByIds(Long[] ids);
+
+    /**
+     * 删除规范建设-直属单位考核评价否决项信息
+     * 
+     * @param id 规范建设-直属单位考核评价否决项主键
+     * @return 结果
+     */
+    public int deleteSjGfjsZsdwkhpjfjxById(Long id);
+
+    int batchSave(List<SjGfjsZsdwkhpjfjx> fjxList);
+
+    int pledit(List<SjGfjsZsdwkhpjfjx> list);
+
+}

qianhe-ydsj/src/main/java/com/qianhe/service/impl/SjGfjsJgbmjcServiceImpl.java

+package com.qianhe.service.impl;
+
+import com.qianhe.common.annotation.DataScope;
+import com.qianhe.common.utils.DateUtils;
+import com.qianhe.common.utils.SecurityUtils;
+import com.qianhe.domain.SjGfjsZsdwwtcj;
+import com.qianhe.mapper.SjGfjsJgbmjcMapper;
+import com.qianhe.service.ISjGfjsJgbmjcService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 规范建设-机关部门检查Service业务层处理
+ *
+ * @author qianhe
+ * @date 2024-07-23
+ */
+@Service
+public class SjGfjsJgbmjcServiceImpl implements ISjGfjsJgbmjcService
+{
+    @Autowired
+    private SjGfjsJgbmjcMapper sjGfjsJcdwwtcjMapper;
+
+    /**
+     * 查询规范建设-机关部门检查
+     *
+     * @param id 规范建设-机关部门检查主键
+     * @return 规范建设-机关部门检查
+     */
+    @Override
+    public SjGfjsZsdwwtcj selectSjGfjsZsdwwtcjById(Long id)
+    {
+        SjGfjsZsdwwtcj zsdwwtcj = sjGfjsJcdwwtcjMapper.selectSjGfjsZsdwwtcjById(id);
+        return zsdwwtcj;
+    }
+
+    /**
+     * 查询规范建设-机关部门检查列表
+     *
+     * @param sjGfjsZsdwwtcj 规范建设-机关部门检查
+     * @return 规范建设-机关部门检查
+     */
+    @Override
+    @DataScope(deptAlias = "c")
+    public List<SjGfjsZsdwwtcj> selectSjGfjsZsdwwtcjList(SjGfjsZsdwwtcj sjGfjsZsdwwtcj)
+    {
+        return sjGfjsJcdwwtcjMapper.selectSjGfjsZsdwwtcjList(sjGfjsZsdwwtcj);
+    }
+
+    /**
+     * 新增规范建设-机关部门检查
+     *
+     * @param sjGfjsZsdwwtcj 规范建设-机关部门检查
+     * @return 结果
+     */
+    @Override
+    public int insertSjGfjsZsdwwtcj(SjGfjsZsdwwtcj sjGfjsZsdwwtcj)
+    {
+        sjGfjsZsdwwtcj.setCreateTime(DateUtils.getNowDate());
+        sjGfjsZsdwwtcj.setCreateBy(SecurityUtils.getUsername());
+        return sjGfjsJcdwwtcjMapper.insertSjGfjsZsdwwtcj(sjGfjsZsdwwtcj);
+    }
+
+    /**
+     * 修改规范建设-机关部门检查
+     *
+     * @param sjGfjsZsdwwtcj 规范建设-机关部门检查
+     * @return 结果
+     */
+    @Override
+    public int updateSjGfjsZsdwwtcj(SjGfjsZsdwwtcj sjGfjsZsdwwtcj)
+    {
+        sjGfjsZsdwwtcj.setUpdateTime(DateUtils.getNowDate());
+        sjGfjsZsdwwtcj.setUpdateBy(SecurityUtils.getUsername());
+        return sjGfjsJcdwwtcjMapper.updateSjGfjsZsdwwtcj(sjGfjsZsdwwtcj);
+    }
+
+    /**
+     * 批量删除规范建设-机关部门检查
+     *
+     * @param ids 需要删除的规范建设-机关部门检查主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSjGfjsZsdwwtcjByIds(Long[] ids)
+    {
+        return sjGfjsJcdwwtcjMapper.deleteSjGfjsZsdwwtcjByIds(ids);
+    }
+
+    /**
+     * 删除规范建设-机关部门检查信息
+     *
+     * @param id 规范建设-机关部门检查主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSjGfjsZsdwwtcjById(Long id)
+    {
+        return sjGfjsJcdwwtcjMapper.deleteSjGfjsZsdwwtcjById(id);
+    }
+
+    @Override
+    public int batchSave(List<SjGfjsZsdwwtcj> list) {
+        return sjGfjsJcdwwtcjMapper.batchSave(list);
+    }
+}

qianhe-ydsj/src/main/java/com/qianhe/service/impl/SjGfjsZsdwfjxcjServiceImpl.java

+package com.qianhe.service.impl;
+
+import com.qianhe.common.annotation.DataScope;
+import com.qianhe.common.utils.DateUtils;
+import com.qianhe.common.utils.SecurityUtils;
+import com.qianhe.domain.SjGfjsZsdwfjxcj;
+import com.qianhe.mapper.SjGfjsZsdwfjxcjMapper;
+import com.qianhe.service.ISjGfjsZsdwfjxcjService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 规范建设-直属单位否决项采集Service业务层处理
+ *
+ * @author qianhe
+ * @date 2024-07-24
+ */
+@Service
+public class SjGfjsZsdwfjxcjServiceImpl implements ISjGfjsZsdwfjxcjService
+{
+    @Autowired
+    private SjGfjsZsdwfjxcjMapper sjGfjsZsdwfjxcjMapper;
+
+    /**
+     * 查询规范建设-直属单位否决项采集
+     *
+     * @param id 规范建设-直属单位否决项采集主键
+     * @return 规范建设-直属单位否决项采集
+     */
+    @Override
+    public SjGfjsZsdwfjxcj selectSjGfjsZsdwfjxcjById(Long id)
+    {
+        return sjGfjsZsdwfjxcjMapper.selectSjGfjsZsdwfjxcjById(id);
+    }
+
+    /**
+     * 查询规范建设-直属单位否决项采集列表
+     *
+     * @param sjGfjsZsdwfjxcj 规范建设-直属单位否决项采集
+     * @return 规范建设-直属单位否决项采集
+     */
+    @Override
+    @DataScope(deptAlias = "c")
+    public List<SjGfjsZsdwfjxcj> selectSjGfjsZsdwfjxcjList(SjGfjsZsdwfjxcj sjGfjsZsdwfjxcj)
+    {
+        return sjGfjsZsdwfjxcjMapper.selectSjGfjsZsdwfjxcjList(sjGfjsZsdwfjxcj);
+    }
+
+    /**
+     * 新增规范建设-直属单位否决项采集
+     *
+     * @param sjGfjsZsdwfjxcj 规范建设-直属单位否决项采集
+     * @return 结果
+     */
+    @Override
+    public int insertSjGfjsZsdwfjxcj(SjGfjsZsdwfjxcj sjGfjsZsdwfjxcj)
+    {
+        sjGfjsZsdwfjxcj.setCreateTime(DateUtils.getNowDate());
+        sjGfjsZsdwfjxcj.setCreateBy(SecurityUtils.getUsername());
+        return sjGfjsZsdwfjxcjMapper.insertSjGfjsZsdwfjxcj(sjGfjsZsdwfjxcj);
+    }
+
+    /**
+     * 修改规范建设-直属单位否决项采集
+     *
+     * @param sjGfjsZsdwfjxcj 规范建设-直属单位否决项采集
+     * @return 结果
+     */
+    @Override
+    public int updateSjGfjsZsdwfjxcj(SjGfjsZsdwfjxcj sjGfjsZsdwfjxcj)
+    {
+        sjGfjsZsdwfjxcj.setUpdateTime(DateUtils.getNowDate());
+        sjGfjsZsdwfjxcj.setUpdateBy(SecurityUtils.getUsername());
+        return sjGfjsZsdwfjxcjMapper.updateSjGfjsZsdwfjxcj(sjGfjsZsdwfjxcj);
+    }
+
+    /**
+     * 批量删除规范建设-直属单位否决项采集
+     *
+     * @param ids 需要删除的规范建设-直属单位否决项采集主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSjGfjsZsdwfjxcjByIds(Long[] ids)
+    {
+        return sjGfjsZsdwfjxcjMapper.deleteSjGfjsZsdwfjxcjByIds(ids);
+    }
+
+    /**
+     * 删除规范建设-直属单位否决项采集信息
+     *
+     * @param id 规范建设-直属单位否决项采集主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSjGfjsZsdwfjxcjById(Long id)
+    {
+        return sjGfjsZsdwfjxcjMapper.deleteSjGfjsZsdwfjxcjById(id);
+    }
+
+    @Override
+    public int batchSave(List<SjGfjsZsdwfjxcj> list) {
+        return sjGfjsZsdwfjxcjMapper.batchSave(list);
+    }
+}

qianhe-ydsj/src/main/java/com/qianhe/service/impl/SjGfjsZsdwkhpjServiceImpl.java

+package com.qianhe.service.impl;
+
+import com.qianhe.common.annotation.DataScope;
+import com.qianhe.common.core.domain.entity.SysDept;
+import com.qianhe.common.core.domain.entity.SysDictData;
+import com.qianhe.common.utils.DateUtils;
+import com.qianhe.common.utils.SecurityUtils;
+import com.qianhe.common.utils.StringUtils;
+import com.qianhe.domain.SjGfjsZsdwkhpj;
+import com.qianhe.domain.SjGfjsZsdwkhpjZb;
+import com.qianhe.mapper.SjGfjsZsdwkhpjMapper;
+import com.qianhe.mapper.SjGfjsZsdwkhpjZbMapper;
+import com.qianhe.service.ISjGfjsZsdwkhpjService;
+import com.qianhe.system.mapper.SysDeptMapper;
+import com.qianhe.system.mapper.SysDictDataMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 规范建设-直属单位考核评价Service业务层处理
+ *
+ * @author qianhe
+ * @date 2024-07-24
+ */
+@Service
+public class SjGfjsZsdwkhpjServiceImpl implements ISjGfjsZsdwkhpjService
+{
+    @Autowired
+    private SjGfjsZsdwkhpjMapper sjGfjsZsdwkhpjMapper;
+    @Autowired
+    private SjGfjsZsdwkhpjZbMapper sjGfjsZsdwkhpjZbMapper;
+    @Autowired
+    private SysDictDataMapper sysDictDataMapper;
+    @Autowired
+    private SysDeptMapper sysDeptMapper;
+
+    /**
+     * 查询规范建设-直属单位考核评价
+     *
+     * @param id 规范建设-直属单位考核评价主键
+     * @return 规范建设-直属单位考核评价
+     */
+    @Override
+    public SjGfjsZsdwkhpj selectSjGfjsZsdwkhpjById(Long id)
+    {
+        return sjGfjsZsdwkhpjMapper.selectSjGfjsZsdwkhpjById(id);
+    }
+
+    /**
+     * 查询规范建设-直属单位考核评价列表
+     *
+     * @param sjGfjsZsdwkhpj 规范建设-直属单位考核评价
+     * @return 规范建设-直属单位考核评价
+     */
+    @Override
+    @DataScope(deptAlias = "d")
+    public List<SjGfjsZsdwkhpj> selectSjGfjsZsdwkhpjList(SjGfjsZsdwkhpj sjGfjsZsdwkhpj)
+    {
+        return sjGfjsZsdwkhpjMapper.selectSjGfjsZsdwkhpjList(sjGfjsZsdwkhpj);
+    }
+
+    /**
+     * 新增规范建设-直属单位考核评价
+     *
+     * @param sjGfjsZsdwkhpj 规范建设-直属单位考核评价
+     * @return 结果
+     */
+    @Override
+    public int insertSjGfjsZsdwkhpj(SjGfjsZsdwkhpj sjGfjsZsdwkhpj)
+    {
+        sjGfjsZsdwkhpj.setCreateTime(DateUtils.getNowDate());
+        return sjGfjsZsdwkhpjMapper.insertSjGfjsZsdwkhpj(sjGfjsZsdwkhpj);
+    }
+
+    /**
+     * 修改规范建设-直属单位考核评价
+     *
+     * @param sjGfjsZsdwkhpj 规范建设-直属单位考核评价
+     * @return 结果
+     */
+    @Override
+    public int updateSjGfjsZsdwkhpj(SjGfjsZsdwkhpj sjGfjsZsdwkhpj)
+    {
+        sjGfjsZsdwkhpj.setUpdateTime(DateUtils.getNowDate());
+        sjGfjsZsdwkhpj.setUpdateBy(SecurityUtils.getUsername());
+        //计算分数
+        return sjGfjsZsdwkhpjMapper.updateSjGfjsZsdwkhpj(sjGfjsZsdwkhpj);
+    }
+
+    /**
+     * 批量删除规范建设-直属单位考核评价
+     *
+     * @param ids 需要删除的规范建设-直属单位考核评价主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSjGfjsZsdwkhpjByIds(Long[] ids)
+    {
+        return sjGfjsZsdwkhpjMapper.deleteSjGfjsZsdwkhpjByIds(ids);
+    }
+
+    /**
+     * 删除规范建设-直属单位考核评价信息
+     *
+     * @param id 规范建设-直属单位考核评价主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSjGfjsZsdwkhpjById(Long id)
+    {
+        return sjGfjsZsdwkhpjMapper.deleteSjGfjsZsdwkhpjById(id);
+    }
+
+    @Override
+    public int batchSave(List<SjGfjsZsdwkhpj> addList) {
+        return sjGfjsZsdwkhpjMapper.batchSave(addList);
+    }
+
+    @Override
+    public int pledit(List<SjGfjsZsdwkhpj> list) {
+        //计算分数
+        SjGfjsZsdwkhpj sjGfjsZsdwkhpj = list.get(0);
+        SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZb = sjGfjsZsdwkhpjZbMapper.selectSjGfjsZsdwkhpjZbById(sjGfjsZsdwkhpj.getZbId());
+        SysDept dept = sysDeptMapper.selectDeptById(sjGfjsZsdwkhpjZb.getDeptId());
+        Map<String,List<SjGfjsZsdwkhpj>> stringListMap = list.stream().collect(Collectors.groupingBy(SjGfjsZsdwkhpj::getKhnr));
+        List<SysDictData> GfjsKhnr = sysDictDataMapper.selectDictDataByType("gfjs_sslj");
+        for(SysDictData data:GfjsKhnr){
+            String dictValue = data.getDictValue();
+            List<SjGfjsZsdwkhpj> sjGfjsZsdwkhpjs = stringListMap.get(data.getDictValue());
+            //计算分数
+            List<Double> doubleList=new ArrayList<>();
+            if(sjGfjsZsdwkhpjs==null){
+                continue;
+            }
+//            sjGfjsZsdwkhpjs.forEach(item->{
+//                if(StringUtils.isEmpty(item.getKhfz())){
+//                    item.setKhfz("0");
+//                }
+//                doubleList.add(Double.parseDouble(item.getKhfz()));
+//            });
+//            double kf = doubleList.stream().mapToDouble(Double::doubleValue).sum();
+//            if("党建引领".equals(dictValue)){
+//                //扣分
+//                sjGfjsZsdwkhpjZb.setDjyjkfs(new BigDecimal(kf));
+//                //扣分比列
+//                BigDecimal df = sjGfjsZsdwkhpjZb.getDjyjzfs().add(new BigDecimal(kf));
+//                BigDecimal kfbl =df.divide(sjGfjsZsdwkhpjZb.getDjyjzfs(),4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
+//                sjGfjsZsdwkhpjZb.setDjyjkfbl(new BigDecimal(100).subtract(kfbl));
+//                //得分
+//                sjGfjsZsdwkhpjZb.setDjyjdf(df);
+//
+//
+//            } else if ("素质提升".equals(dictValue)) {
+////扣分
+//                sjGfjsZsdwkhpjZb.setSztskfs(new BigDecimal(kf));
+//                //扣分比列
+//                BigDecimal df = sjGfjsZsdwkhpjZb.getSztszfs().add(new BigDecimal(kf));
+//                BigDecimal kfbl =df.divide(sjGfjsZsdwkhpjZb.getSztszfs(),4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
+//                sjGfjsZsdwkhpjZb.setSztsfbl(new BigDecimal(100).subtract(kfbl));
+//                //得分
+//                sjGfjsZsdwkhpjZb.setSztsdf(df);
+//            } else if ("管理精益".equals(dictValue)) {
+//                sjGfjsZsdwkhpjZb.setGlgfkfs(new BigDecimal(kf));
+//                //扣分比列
+//                BigDecimal df = sjGfjsZsdwkhpjZb.getGlgfzfs().add(new BigDecimal(kf));
+//                BigDecimal kfbl =df.divide(sjGfjsZsdwkhpjZb.getGlgfzfs(),4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
+//                sjGfjsZsdwkhpjZb.setGlgfbl(new BigDecimal(100).subtract(kfbl));
+//                //得分
+//                sjGfjsZsdwkhpjZb.setGlgfdf(df);
+//            } else if ("业务创效".equals(dictValue)) {
+//                sjGfjsZsdwkhpjZb.setYwcxkfs(new BigDecimal(kf));
+//                //扣分比列
+//                BigDecimal df = sjGfjsZsdwkhpjZb.getYwcxzfs().add(new BigDecimal(kf));
+//                BigDecimal kfbl =df.divide(sjGfjsZsdwkhpjZb.getYwcxzfs(),4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
+//                sjGfjsZsdwkhpjZb.setYwcxbl(new BigDecimal(100).subtract(kfbl));
+//                //得分
+//                sjGfjsZsdwkhpjZb.setYwcxdf(df);
+//            }
+//
+//        }
+//
+//        BigDecimal sum = sjGfjsZsdwkhpjZb.getDjyjzfs().add(sjGfjsZsdwkhpjZb.getSztszfs()).add(sjGfjsZsdwkhpjZb.getGlgfzfs()).add(sjGfjsZsdwkhpjZb.getYwcxzfs());
+//        //总得分
+//        BigDecimal sunfs = sjGfjsZsdwkhpjZb.getDjyjdf().add(sjGfjsZsdwkhpjZb.getSztsdf()).add(sjGfjsZsdwkhpjZb.getGlgfdf()).add(sjGfjsZsdwkhpjZb.getYwcxdf());
+//        sjGfjsZsdwkhpjZb.setZdf(sunfs);
+//        //总扣分
+//        sjGfjsZsdwkhpjZb.setZkf(sum.subtract(sunfs));
+//        //总扣分比例
+//        BigDecimal bigDecimal = sunfs.divide(sum,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
+//        sjGfjsZsdwkhpjZb.setZkfbl(new BigDecimal(100).subtract(bigDecimal));
+//        //综合得分
+//        String deptDfl = dept.getDeptDfl();
+//        if(StringUtils.isNotEmpty(deptDfl)){
+//           if ("B类".equals(deptDfl)) {
+//              sjGfjsZsdwkhpjZb.setZhdf( sunfs.multiply(new BigDecimal(0.9)).setScale(2, BigDecimal.ROUND_HALF_UP));
+//            }else if ("C类".equals(deptDfl)) {
+//               sjGfjsZsdwkhpjZb.setZhdf( sunfs.multiply(new BigDecimal(0.85)).setScale(2, BigDecimal.ROUND_HALF_UP));
+//            }else {
+//               sjGfjsZsdwkhpjZb.setZhdf(sunfs);
+//           }
+        }
+        //更新主表
+        sjGfjsZsdwkhpjZbMapper.updateSjGfjsZsdwkhpjZb(sjGfjsZsdwkhpjZb);
+        return sjGfjsZsdwkhpjMapper.pledit(list);
+    }
+
+    public static void main(String[] args) {
+        System.out.println(Double.parseDouble("-5"));
+        System.out.println(Double.parseDouble("+5"));
+    }
+
+
+}

qianhe-ydsj/src/main/java/com/qianhe/service/impl/SjGfjsZsdwkhpjfjxServiceImpl.java

+package com.qianhe.service.impl;
+
+import com.qianhe.common.annotation.DataScope;
+import com.qianhe.common.utils.DateUtils;
+import com.qianhe.domain.SjGfjsZsdwkhpjZb;
+import com.qianhe.domain.SjGfjsZsdwkhpjfjx;
+import com.qianhe.mapper.SjGfjsZsdwkhpjZbMapper;
+import com.qianhe.mapper.SjGfjsZsdwkhpjfjxMapper;
+import com.qianhe.service.ISjGfjsZsdwkhpjfjxService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 规范建设-直属单位考核评价否决项Service业务层处理
+ *
+ * @author qianhe
+ * @date 2024-07-24
+ */
+@Service
+public class SjGfjsZsdwkhpjfjxServiceImpl implements ISjGfjsZsdwkhpjfjxService
+{
+    @Autowired
+    private SjGfjsZsdwkhpjfjxMapper sjGfjsZsdwkhpjfjxMapper;
+
+    @Autowired
+    private SjGfjsZsdwkhpjZbMapper sjGfjsZsdwkhpjZbMapper;
+    /**
+     * 查询规范建设-直属单位考核评价否决项
+     *
+     * @param id 规范建设-直属单位考核评价否决项主键
+     * @return 规范建设-直属单位考核评价否决项
+     */
+    @Override
+    public SjGfjsZsdwkhpjfjx selectSjGfjsZsdwkhpjfjxById(Long id)
+    {
+        return sjGfjsZsdwkhpjfjxMapper.selectSjGfjsZsdwkhpjfjxById(id);
+    }
+
+    /**
+     * 查询规范建设-直属单位考核评价否决项列表
+     *
+     * @param sjGfjsZsdwkhpjfjx 规范建设-直属单位考核评价否决项
+     * @return 规范建设-直属单位考核评价否决项
+     */
+    @Override
+    @DataScope(deptAlias = "d")
+    public List<SjGfjsZsdwkhpjfjx> selectSjGfjsZsdwkhpjfjxList(SjGfjsZsdwkhpjfjx sjGfjsZsdwkhpjfjx)
+    {
+        return sjGfjsZsdwkhpjfjxMapper.selectSjGfjsZsdwkhpjfjxList(sjGfjsZsdwkhpjfjx);
+    }
+
+    /**
+     * 新增规范建设-直属单位考核评价否决项
+     *
+     * @param sjGfjsZsdwkhpjfjx 规范建设-直属单位考核评价否决项
+     * @return 结果
+     */
+    @Override
+    public int insertSjGfjsZsdwkhpjfjx(SjGfjsZsdwkhpjfjx sjGfjsZsdwkhpjfjx)
+    {
+        sjGfjsZsdwkhpjfjx.setCreateTime(DateUtils.getNowDate());
+        return sjGfjsZsdwkhpjfjxMapper.insertSjGfjsZsdwkhpjfjx(sjGfjsZsdwkhpjfjx);
+    }
+
+    /**
+     * 修改规范建设-直属单位考核评价否决项
+     *
+     * @param sjGfjsZsdwkhpjfjx 规范建设-直属单位考核评价否决项
+     * @return 结果
+     */
+    @Override
+    public int updateSjGfjsZsdwkhpjfjx(SjGfjsZsdwkhpjfjx sjGfjsZsdwkhpjfjx)
+    {
+        sjGfjsZsdwkhpjfjx.setUpdateTime(DateUtils.getNowDate());
+        return sjGfjsZsdwkhpjfjxMapper.updateSjGfjsZsdwkhpjfjx(sjGfjsZsdwkhpjfjx);
+    }
+
+    /**
+     * 批量删除规范建设-直属单位考核评价否决项
+     *
+     * @param ids 需要删除的规范建设-直属单位考核评价否决项主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSjGfjsZsdwkhpjfjxByIds(Long[] ids)
+    {
+        return sjGfjsZsdwkhpjfjxMapper.deleteSjGfjsZsdwkhpjfjxByIds(ids);
+    }
+
+    /**
+     * 删除规范建设-直属单位考核评价否决项信息
+     *
+     * @param id 规范建设-直属单位考核评价否决项主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSjGfjsZsdwkhpjfjxById(Long id)
+    {
+        return sjGfjsZsdwkhpjfjxMapper.deleteSjGfjsZsdwkhpjfjxById(id);
+    }
+
+    @Override
+    public int batchSave(List<SjGfjsZsdwkhpjfjx> fjxList) {
+        return sjGfjsZsdwkhpjfjxMapper.batchSave(fjxList);
+    }
+
+    @Override
+    public int pledit(List<SjGfjsZsdwkhpjfjx> list) {
+        SjGfjsZsdwkhpjfjx sjGfjsZsdwkhpjfjx = list.get(0);
+        SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZb = sjGfjsZsdwkhpjZbMapper.selectSjGfjsZsdwkhpjZbById(sjGfjsZsdwkhpjfjx.getZbId());
+        List<SjGfjsZsdwkhpjfjx> collect = list.stream().filter(item -> "是".equals(item.getSffs())).collect(Collectors.toList());
+        sjGfjsZsdwkhpjZb.setSffjxs(new BigDecimal(collect.size()));
+        sjGfjsZsdwkhpjZbMapper.updateSjGfjsZsdwkhpjZb(sjGfjsZsdwkhpjZb);
+        return sjGfjsZsdwkhpjfjxMapper.pledit(list);
+    }
+}

qianhe-ydsj/src/main/resources/mapper/SjGfjsJgbmjcMapper.xml

+<?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.qianhe.mapper.SjGfjsJgbmjcMapper">
+
+    <resultMap type="SjGfjsZsdwwtcj" id="SjGfjsZsdwwtcjResult">
+        <result property="id"    column="id"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="rq"    column="rq"    />
+        <result property="jcjb"    column="jcjb"    />
+        <result property="wtmc"    column="wtmc"    />
+        <result property="khnr"    column="khnr"    />
+        <result property="khxd"    column="khxd"    />
+        <result property="pjbzid"    column="pjbzid"    />
+        <result property="pjbzmc"    column="pjbzmc"    />
+        <result property="zgzrr"    column="zgzrr"    />
+        <result property="zgcs"    column="zgcs"    />
+        <result property="zgqx"    column="zgqx"    />
+        <result property="zgzt"    column="zgzt"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+        <result property="yl1"    column="yl1"    />
+        <result property="yl2"    column="yl2"    />
+        <result property="yl3"    column="yl3"    />
+        <result property="yl4"    column="yl4"    />
+        <result property="yl5"    column="yl5"    />
+        <result property="deptName"    column="dept_name"    />
+        <result property="deptLx"    column="dept_lx"    />
+    </resultMap>
+
+    <sql id="selectSjGfjsZsdwwtcjVo">
+        select id,
+               a.dept_id,
+               rq,
+               jcjb,
+               wtmc,
+               khnr,
+               khxd,
+               pjbzid,
+               pjbzmc,
+               zgzrr,
+               zgcs,
+               zgqx,
+               zgzt,
+               a.create_by,
+               a.create_time,
+               a.update_by,
+               a.update_time,
+               remark,
+               yl1,
+               yl2,
+               a.yl3,
+               yl4,
+               yl5,
+               d.dept_name,
+               d.dept_lx,
+               c.dept_name as yl3name
+        from sj_gfjs_zsdwwtcj a
+                 left join sys_dept d on a.dept_id=d.dept_id
+                 left join sys_dept c on a.yl3=c.dept_id
+        </sql>
+
+    <select id="selectSjGfjsZsdwwtcjList" parameterType="SjGfjsZsdwwtcj" resultMap="SjGfjsZsdwwtcjResult">
+        <include refid="selectSjGfjsZsdwwtcjVo"/>
+        <where>
+            <if test="deptId != null ">and (a.dept_id = #{deptId} or  find_in_set(#{deptId},d.ancestors))</if>
+            <if test="rq != null  and rq != ''"> and rq = #{rq}</if>
+            <if test="jcjb != null  and jcjb != ''"> and jcjb = #{jcjb}</if>
+            <if test="wtmc != null  and wtmc != ''"> and wtmc = #{wtmc}</if>
+            <if test="khnr != null  and khnr != ''"> and khnr = #{khnr}</if>
+            <if test="khxd != null  and khxd != ''"> and khxd = #{khxd}</if>
+            <if test="pjbzid != null  and pjbzid != ''"> and pjbzid = #{pjbzid}</if>
+            <if test="pjbzmc != null  and pjbzmc != ''"> and pjbzmc = #{pjbzmc}</if>
+            <if test="zgzrr != null  and zgzrr != ''"> and zgzrr = #{zgzrr}</if>
+            <if test="zgcs != null  and zgcs != ''"> and zgcs = #{zgcs}</if>
+            <if test="zgqx != null  and zgqx != ''"> and zgqx = #{zgqx}</if>
+            <if test="zgzt != null  and zgzt != ''"> and zgzt = #{zgzt}</if>
+            <if test="yl1 != null  and yl1 != ''"> and yl1 = #{yl1}</if>
+            <if test="yl2 != null  and yl2 != ''"> and yl2 = #{yl2}</if>
+            <if test="yl3 != null  and yl3 != ''"> and yl3 = #{yl3}</if>
+            <if test="yl4 != null  and yl4 != ''"> and yl4 = #{yl4}</if>
+            <if test="yl5 != null  and yl5 != ''"> and yl5 = #{yl5}</if>
+            <if test="startRq != null  and startRq != ''"> and rq >= #{startRq}</if>
+            <if test="endRq != null  and endRq != ''"> and rq &lt;= #{endRq}</if>
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
+        </where>
+        order by  a.rq desc
+    </select>
+
+    <select id="selectSjGfjsZsdwwtcjById" parameterType="Long" resultMap="SjGfjsZsdwwtcjResult">
+        <include refid="selectSjGfjsZsdwwtcjVo"/>
+        where a.id = #{id}
+    </select>
+
+    <insert id="insertSjGfjsZsdwwtcj" parameterType="SjGfjsZsdwwtcj" useGeneratedKeys="true" keyProperty="id">
+        insert into sj_gfjs_zsdwwtcj
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="deptId != null">dept_id,</if>
+            <if test="rq != null">rq,</if>
+            <if test="jcjb != null">jcjb,</if>
+            <if test="wtmc != null">wtmc,</if>
+            <if test="khnr != null">khnr,</if>
+            <if test="khxd != null">khxd,</if>
+            <if test="pjbzid != null">pjbzid,</if>
+            <if test="pjbzmc != null">pjbzmc,</if>
+            <if test="zgzrr != null">zgzrr,</if>
+            <if test="zgcs != null">zgcs,</if>
+            <if test="zgqx != null">zgqx,</if>
+            <if test="zgzt != null">zgzt,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+            <if test="yl1 != null">yl1,</if>
+            <if test="yl2 != null">yl2,</if>
+            <if test="yl3 != null">yl3,</if>
+            <if test="yl4 != null">yl4,</if>
+            <if test="yl5 != null">yl5,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="deptId != null">#{deptId},</if>
+            <if test="rq != null">#{rq},</if>
+            <if test="jcjb != null">#{jcjb},</if>
+            <if test="wtmc != null">#{wtmc},</if>
+            <if test="khnr != null">#{khnr},</if>
+            <if test="khxd != null">#{khxd},</if>
+            <if test="pjbzid != null">#{pjbzid},</if>
+            <if test="pjbzmc != null">#{pjbzmc},</if>
+            <if test="zgzrr != null">#{zgzrr},</if>
+            <if test="zgcs != null">#{zgcs},</if>
+            <if test="zgqx != null">#{zgqx},</if>
+            <if test="zgzt != null">#{zgzt},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="yl1 != null">#{yl1},</if>
+            <if test="yl2 != null">#{yl2},</if>
+            <if test="yl3 != null">#{yl3},</if>
+            <if test="yl4 != null">#{yl4},</if>
+            <if test="yl5 != null">#{yl5},</if>
+         </trim>
+    </insert>
+    <insert id="batchSave">
+        insert into sj_gfjs_zsdwwtcj( dept_id, rq, jcjb, wtmc, khnr, khxd, pjbzid, pjbzmc, zgzrr, zgcs, zgqx, zgzt,create_by,create_time,remark,yl1,yl2,yl3,yl4,yl5) values
+        <foreach item="item" index="index" collection="list" separator=",">
+            (  #{item.deptId}, #{item.rq}, #{item.jcjb}, #{item.wtmc}, #{item.khnr}, #{item.khxd}, #{item.pjbzid}, #{item.pjbzmc}, #{item.zgzrr}, #{item.zgcs}, #{item.zgqx}, #{item.zgzt}
+            , #{item.createBy}, #{item.createTime},  #{item.remark},#{item.yl1}, #{item.yl2}, #{item.yl3}, #{item.yl4}, #{item.yl5})
+        </foreach>
+    </insert>
+
+    <update id="updateSjGfjsZsdwwtcj" parameterType="SjGfjsZsdwwtcj">
+        update sj_gfjs_zsdwwtcj
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="rq != null">rq = #{rq},</if>
+            <if test="jcjb != null">jcjb = #{jcjb},</if>
+            <if test="wtmc != null">wtmc = #{wtmc},</if>
+            <if test="khnr != null">khnr = #{khnr},</if>
+            <if test="khxd != null">khxd = #{khxd},</if>
+            <if test="pjbzid != null">pjbzid = #{pjbzid},</if>
+            <if test="pjbzmc != null">pjbzmc = #{pjbzmc},</if>
+            <if test="zgzrr != null">zgzrr = #{zgzrr},</if>
+            <if test="zgcs != null">zgcs = #{zgcs},</if>
+            <if test="zgqx != null">zgqx = #{zgqx},</if>
+            <if test="zgzt != null">zgzt = #{zgzt},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="yl1 != null">yl1 = #{yl1},</if>
+            <if test="yl2 != null">yl2 = #{yl2},</if>
+            <if test="yl3 != null">yl3 = #{yl3},</if>
+            <if test="yl4 != null">yl4 = #{yl4},</if>
+            <if test="yl5 != null">yl5 = #{yl5},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteSjGfjsZsdwwtcjById" parameterType="Long">
+        delete from sj_gfjs_zsdwwtcj where id = #{id}
+    </delete>
+
+    <delete id="deleteSjGfjsZsdwwtcjByIds" parameterType="String">
+        delete from sj_gfjs_zsdwwtcj where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

qianhe-ydsj/src/main/resources/mapper/SjGfjsYdjcjlMapper.xml

@@ -208,7 +208,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
 
-    <select id="selectSjGfjsZsdwwtcjList" parameterType="SjGfjsZsdwwtcj" resultMap="SjGfjsZsdwwtcjResult">
+    <resultMap type="SjGfjsZsdwwtcj" id="SjGfjsZsdwwtcjResult2">
+        <result property="id"    column="id"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="rq"    column="rq"    />
+        <result property="jcjb"    column="jcjb"    />
+        <result property="wtmc"    column="wtmc"    />
+        <result property="khnr"    column="khnr"    />
+        <result property="khxd"    column="khxd"    />
+        <result property="pjbzid"    column="pjbzid"    />
+        <result property="pjbzmc"    column="pjbzmc"    />
+        <result property="zgzrr"    column="zgzrr"    />
+        <result property="zgcs"    column="zgcs"    />
+        <result property="zgqx"    column="zgqx"    />
+        <result property="zgzt"    column="zgzt"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+        <result property="yl1"    column="yl1"    />
+        <result property="yl2"    column="yl2"    />
+        <result property="yl3"    column="yl3"    />
+        <result property="yl4"    column="yl4"    />
+        <result property="yl5"    column="yl5"    />
+        <result property="deptName"    column="dept_name"    />
+        <result property="deptLx"    column="dept_lx"    />
+    </resultMap>
+    <select id="selectSjGfjsZsdwwtcjList" parameterType="SjGfjsZsdwwtcj" resultMap="SjGfjsZsdwwtcjResult2">
         select id,
         a.dept_id,
         rq,

qianhe-ydsj/src/main/resources/mapper/SjGfjsZsdwfjxcjMapper.xml

+<?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.qianhe.mapper.SjGfjsZsdwfjxcjMapper">
+    
+    <resultMap type="SjGfjsZsdwfjxcj" id="SjGfjsZsdwfjxcjResult">
+        <result property="id"    column="id"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="rq"    column="rq"    />
+        <result property="flmc"    column="flmc"    />
+        <result property="pjbzid"    column="pjbzid"    />
+        <result property="pjbzmc"    column="pjbzmc"    />
+        <result property="wtmc"    column="wtmc"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+        <result property="yl1"    column="yl1"    />
+        <result property="yl2"    column="yl2"    />
+        <result property="yl3"    column="yl3"    />
+        <result property="yl4"    column="yl4"    />
+        <result property="yl5"    column="yl5"    />
+        <result property="deptName"    column="dept_name"    />
+    </resultMap>
+
+    <sql id="selectSjGfjsZsdwfjxcjVo">
+        select id,
+               a.dept_id,
+               rq,
+               flmc,
+               pjbzid,
+               pjbzmc,
+               wtmc,
+               a.create_by,
+               a.create_time,
+               a.update_by,
+               a.update_time,
+               a.remark,
+               yl1,
+               yl2,
+               yl3,
+               yl4,
+               yl5,d.dept_name,
+                 c.dept_name as yl3name
+        from sj_gfjs_zsdwfjxcj a
+                 left join  sys_dept d on a.dept_id=d.dept_id
+                  left join sys_dept c on a.yl3=c.dept_id
+</sql>
+
+    <select id="selectSjGfjsZsdwfjxcjList" parameterType="SjGfjsZsdwfjxcj" resultMap="SjGfjsZsdwfjxcjResult">
+        <include refid="selectSjGfjsZsdwfjxcjVo"/>
+        <where>
+            <if test="deptId != null ">and (a.dept_id = #{deptId} or  find_in_set(#{deptId},d.ancestors))</if>
+            <if test="rq != null  and rq != ''"> and rq = #{rq}</if>
+            <if test="flmc != null  and flmc != ''"> and flmc = #{flmc}</if>
+            <if test="pjbzid != null  and pjbzid != ''"> and pjbzid = #{pjbzid}</if>
+            <if test="pjbzmc != null  and pjbzmc != ''"> and pjbzmc = #{pjbzmc}</if>
+            <if test="wtmc != null  and wtmc != ''"> and wtmc = #{wtmc}</if>
+            <if test="yl1 != null  and yl1 != ''"> and yl1 = #{yl1}</if>
+            <if test="yl2 != null  and yl2 != ''"> and yl2 = #{yl2}</if>
+            <if test="yl3 != null  and yl3 != ''"> and yl3 = #{yl3}</if>
+            <if test="yl4 != null  and yl4 != ''"> and yl4 = #{yl4}</if>
+            <if test="yl5 != null  and yl5 != ''"> and yl5 = #{yl5}</if>
+            <if test="startRq != null  and startRq != ''"> and rq >= #{startRq}</if>
+            <if test="endRq != null  and endRq != ''"> and rq &lt;= #{endRq}</if>
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
+        </where>
+        order by  a.rq desc
+    </select>
+    
+    <select id="selectSjGfjsZsdwfjxcjById" parameterType="Long" resultMap="SjGfjsZsdwfjxcjResult">
+        <include refid="selectSjGfjsZsdwfjxcjVo"/>
+        where id = #{id}
+    </select>
+
+
+    <insert id="insertSjGfjsZsdwfjxcj" parameterType="SjGfjsZsdwfjxcj" useGeneratedKeys="true" keyProperty="id">
+        insert into sj_gfjs_zsdwfjxcj
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="deptId != null">dept_id,</if>
+            <if test="rq != null">rq,</if>
+            <if test="flmc != null">flmc,</if>
+            <if test="pjbzid != null">pjbzid,</if>
+            <if test="pjbzmc != null">pjbzmc,</if>
+            <if test="wtmc != null">wtmc,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+            <if test="yl1 != null">yl1,</if>
+            <if test="yl2 != null">yl2,</if>
+            <if test="yl3 != null">yl3,</if>
+            <if test="yl4 != null">yl4,</if>
+            <if test="yl5 != null">yl5,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="deptId != null">#{deptId},</if>
+            <if test="rq != null">#{rq},</if>
+            <if test="flmc != null">#{flmc},</if>
+            <if test="pjbzid != null">#{pjbzid},</if>
+            <if test="pjbzmc != null">#{pjbzmc},</if>
+            <if test="wtmc != null">#{wtmc},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="yl1 != null">#{yl1},</if>
+            <if test="yl2 != null">#{yl2},</if>
+            <if test="yl3 != null">#{yl3},</if>
+            <if test="yl4 != null">#{yl4},</if>
+            <if test="yl5 != null">#{yl5},</if>
+         </trim>
+    </insert>
+    <insert id="batchSave">
+        insert into sj_gfjs_zsdwfjxcj( id, dept_id, rq, flmc, pjbzid, pjbzmc, wtmc,create_by,create_time,remark,yl1,yl2,yl3,yl4,yl5) values
+        <foreach item="item" index="index" collection="list" separator=",">
+            ( #{item.id}, #{item.deptId}, #{item.rq}, #{item.flmc}, #{item.pjbzid}, #{item.pjbzmc}, #{item.wtmc}
+            , #{item.createBy}, #{item.createTime},  #{item.remark},#{item.yl1}, #{item.yl2}, #{item.yl3}, #{item.yl4}, #{item.yl5})
+        </foreach>
+    </insert>
+
+    <update id="updateSjGfjsZsdwfjxcj" parameterType="SjGfjsZsdwfjxcj">
+        update sj_gfjs_zsdwfjxcj
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="rq != null">rq = #{rq},</if>
+            <if test="flmc != null">flmc = #{flmc},</if>
+            <if test="pjbzid != null">pjbzid = #{pjbzid},</if>
+            <if test="pjbzmc != null">pjbzmc = #{pjbzmc},</if>
+            <if test="wtmc != null">wtmc = #{wtmc},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="yl1 != null">yl1 = #{yl1},</if>
+            <if test="yl2 != null">yl2 = #{yl2},</if>
+            <if test="yl3 != null">yl3 = #{yl3},</if>
+            <if test="yl4 != null">yl4 = #{yl4},</if>
+            <if test="yl5 != null">yl5 = #{yl5},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteSjGfjsZsdwfjxcjById" parameterType="Long">
+        delete from sj_gfjs_zsdwfjxcj where id = #{id}
+    </delete>
+
+    <delete id="deleteSjGfjsZsdwfjxcjByIds" parameterType="String">
+        delete from sj_gfjs_zsdwfjxcj where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

qianhe-ydsj/src/main/resources/mapper/SjGfjsZsdwkhpjfjxMapper.xml

+<?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.qianhe.mapper.SjGfjsZsdwkhpjfjxMapper">
+    
+    <resultMap type="SjGfjsZsdwkhpjfjx" id="SjGfjsZsdwkhpjfjxResult">
+        <result property="id"    column="id"    />
+        <result property="zbId"    column="zb_id"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="nd"    column="nd"    />
+        <result property="zqfw"    column="zqfw"    />
+        <result property="zqlx"    column="zqlx"    />
+        <result property="jb"    column="jb"    />
+        <result property="flmc"    column="flmc"    />
+        <result property="pjbzid"    column="pjbzid"    />
+        <result property="pjbzmc"    column="pjbzmc"    />
+        <result property="sffs"    column="sffs"    />
+        <result property="wtms"    column="wtms"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+        <result property="yl1"    column="yl1"    />
+        <result property="yl2"    column="yl2"    />
+        <result property="yl3"    column="yl3"    />
+        <result property="yl4"    column="yl4"    />
+        <result property="yl5"    column="yl5"    />
+        <result property="deptName"    column="dept_name"    />
+    </resultMap>
+
+    <sql id="selectSjGfjsZsdwkhpjfjxVo">
+        select id,
+               zb_id,
+               a.dept_id,
+               nd,
+               zqfw,
+               zqlx,
+               jb,
+               flmc,
+               pjbzid,
+               pjbzmc,
+               sffs,
+               wtms,
+               a.create_by,
+               a.create_time,
+               a.update_by,
+               a.update_time,
+               remark,
+               yl1,
+               yl2,
+               yl3,
+               yl4,
+               yl5,d.dept_name
+        from sj_gfjs_zsdwkhpjfjx a
+                 left join  sys_dept d on a.dept_id=d.dept_id
+</sql>
+
+    <select id="selectSjGfjsZsdwkhpjfjxList" parameterType="SjGfjsZsdwkhpjfjx" resultMap="SjGfjsZsdwkhpjfjxResult">
+        <include refid="selectSjGfjsZsdwkhpjfjxVo"/>
+        <where>  
+            <if test="zbId != null "> and zb_id = #{zbId}</if>
+            <if test="deptId != null "> and a.dept_id = #{deptId}</if>
+            <if test="nd != null  and nd != ''"> and nd = #{nd}</if>
+            <if test="zqfw != null  and zqfw != ''"> and zqfw = #{zqfw}</if>
+            <if test="zqlx != null  and zqlx != ''"> and zqlx = #{zqlx}</if>
+            <if test="jb != null  and jb != ''"> and jb = #{jb}</if>
+            <if test="flmc != null  and flmc != ''"> and flmc = #{flmc}</if>
+            <if test="pjbzid != null  and pjbzid != ''"> and pjbzid = #{pjbzid}</if>
+            <if test="pjbzmc != null  and pjbzmc != ''"> and pjbzmc = #{pjbzmc}</if>
+            <if test="sffs != null  and sffs != ''"> and sffs = #{sffs}</if>
+            <if test="wtms != null  and wtms != ''"> and wtms = #{wtms}</if>
+            <if test="yl1 != null  and yl1 != ''"> and yl1 = #{yl1}</if>
+            <if test="yl2 != null  and yl2 != ''"> and yl2 = #{yl2}</if>
+            <if test="yl3 != null  and yl3 != ''"> and yl3 = #{yl3}</if>
+            <if test="yl4 != null  and yl4 != ''"> and yl4 = #{yl4}</if>
+            <if test="yl5 != null  and yl5 != ''"> and yl5 = #{yl5}</if>
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
+        </where>
+        order by  yl1
+    </select>
+    
+    <select id="selectSjGfjsZsdwkhpjfjxById" parameterType="Long" resultMap="SjGfjsZsdwkhpjfjxResult">
+        <include refid="selectSjGfjsZsdwkhpjfjxVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertSjGfjsZsdwkhpjfjx" parameterType="SjGfjsZsdwkhpjfjx" useGeneratedKeys="true" keyProperty="id">
+        insert into sj_gfjs_zsdwkhpjfjx
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="zbId != null">zb_id,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="nd != null">nd,</if>
+            <if test="zqfw != null">zqfw,</if>
+            <if test="zqlx != null">zqlx,</if>
+            <if test="jb != null">jb,</if>
+            <if test="flmc != null">flmc,</if>
+            <if test="pjbzid != null">pjbzid,</if>
+            <if test="pjbzmc != null">pjbzmc,</if>
+            <if test="sffs != null">sffs,</if>
+            <if test="wtms != null">wtms,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+            <if test="yl1 != null">yl1,</if>
+            <if test="yl2 != null">yl2,</if>
+            <if test="yl3 != null">yl3,</if>
+            <if test="yl4 != null">yl4,</if>
+            <if test="yl5 != null">yl5,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="zbId != null">#{zbId},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="nd != null">#{nd},</if>
+            <if test="zqfw != null">#{zqfw},</if>
+            <if test="zqlx != null">#{zqlx},</if>
+            <if test="jb != null">#{jb},</if>
+            <if test="flmc != null">#{flmc},</if>
+            <if test="pjbzid != null">#{pjbzid},</if>
+            <if test="pjbzmc != null">#{pjbzmc},</if>
+            <if test="sffs != null">#{sffs},</if>
+            <if test="wtms != null">#{wtms},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="yl1 != null">#{yl1},</if>
+            <if test="yl2 != null">#{yl2},</if>
+            <if test="yl3 != null">#{yl3},</if>
+            <if test="yl4 != null">#{yl4},</if>
+            <if test="yl5 != null">#{yl5},</if>
+         </trim>
+    </insert>
+    <insert id="batchSave">
+        insert into sj_gfjs_zsdwkhpjfjx( id, zb_id, dept_id, nd, zqfw, zqlx, jb, flmc, pjbzid, pjbzmc, sffs, wtms,   remark, yl1, yl2, yl3, yl4, yl5) values
+        <foreach item="item" index="index" collection="list" separator=",">
+            ( #{item.id}, #{item.zbId}, #{item.deptId}, #{item.nd}, #{item.zqfw}, #{item.zqlx}, #{item.jb}, #{item.flmc}, #{item.pjbzid}, #{item.pjbzmc}, #{item.sffs}, #{item.wtms},  #{item.remark}, #{item.yl1}, #{item.yl2}, #{item.yl3}, #{item.yl4}, #{item.yl5})
+        </foreach>
+    </insert>
+
+    <update id="updateSjGfjsZsdwkhpjfjx" parameterType="SjGfjsZsdwkhpjfjx">
+        update sj_gfjs_zsdwkhpjfjx
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="zbId != null">zb_id = #{zbId},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="nd != null">nd = #{nd},</if>
+            <if test="zqfw != null">zqfw = #{zqfw},</if>
+            <if test="zqlx != null">zqlx = #{zqlx},</if>
+            <if test="jb != null">jb = #{jb},</if>
+            <if test="flmc != null">flmc = #{flmc},</if>
+            <if test="pjbzid != null">pjbzid = #{pjbzid},</if>
+            <if test="pjbzmc != null">pjbzmc = #{pjbzmc},</if>
+            <if test="sffs != null">sffs = #{sffs},</if>
+            <if test="wtms != null">wtms = #{wtms},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="yl1 != null">yl1 = #{yl1},</if>
+            <if test="yl2 != null">yl2 = #{yl2},</if>
+            <if test="yl3 != null">yl3 = #{yl3},</if>
+            <if test="yl4 != null">yl4 = #{yl4},</if>
+            <if test="yl5 != null">yl5 = #{yl5},</if>
+        </trim>
+        where id = #{id}
+    </update>
+    <update id="pledit">
+       <foreach collection="list" item="item" index="index" separator=";">
+           update sj_gfjs_zsdwkhpjfjx set sffs=#{item.sffs},wtms=#{item.wtms} where id =#{item.id}
+       </foreach>
+    </update>
+
+    <delete id="deleteSjGfjsZsdwkhpjfjxById" parameterType="Long">
+        delete from sj_gfjs_zsdwkhpjfjx where id = #{id}
+    </delete>
+
+    <delete id="deleteSjGfjsZsdwkhpjfjxByIds" parameterType="String">
+        delete from sj_gfjs_zsdwkhpjfjx where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file