2025-07-15 规范建设 V2

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

+package com.qianhe.controller;
+
+import com.qianhe.common.annotation.Log;
+import com.qianhe.common.core.controller.BaseController;
+import com.qianhe.common.core.domain.AjaxResult;
+import com.qianhe.common.core.page.TableDataInfo;
+import com.qianhe.common.enums.BusinessType;
+import com.qianhe.common.utils.poi.ExcelUtil;
+import com.qianhe.domain.SjGfjsZsdwkhpjZb;
+import com.qianhe.service.ISjGfjsJcdwkhpjZbService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 规范建设-基层单位考核评价主Controller
+ *
+ * @author qianhe
+ * @date 2024-07-24
+ */
+@RestController
+@RequestMapping("/system/sjGfjsJcdwkhpjZb")
+public class SjGfjsJcdwkhpjZbController extends BaseController
+{
+    @Autowired
+    private ISjGfjsJcdwkhpjZbService sjGfjsZsdwkhpjZbService;
+
+
+    /**
+     * 查询规范建设-基层单位考核评价主列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZb)
+    {
+        startPage();
+        List<SjGfjsZsdwkhpjZb> list = sjGfjsZsdwkhpjZbService.selectSjGfjsZsdwkhpjZbList(sjGfjsZsdwkhpjZb);
+        return getDataTable(list);
+    }
+
+
+
+
+    /**
+     * 导出规范建设-基层单位考核评价主列表
+     */
+    @Log(title = "规范建设-基层单位考核评价主", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZb)
+    {
+        List<SjGfjsZsdwkhpjZb> list = sjGfjsZsdwkhpjZbService.selectSjGfjsZsdwkhpjZbList(sjGfjsZsdwkhpjZb);
+        ExcelUtil<SjGfjsZsdwkhpjZb> util = new ExcelUtil<SjGfjsZsdwkhpjZb>(SjGfjsZsdwkhpjZb.class);
+        util.exportExcel(response, list, "规范建设-基层单位考核评价主数据");
+    }
+
+    /**
+     * 获取规范建设-基层单位考核评价主详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(sjGfjsZsdwkhpjZbService.selectSjGfjsZsdwkhpjZbById(id));
+    }
+
+    /**
+     * 新增规范建设-基层单位考核评价主
+     */
+    @Log(title = "规范建设-基层单位考核评价主", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZb)
+    {
+        return toAjax(sjGfjsZsdwkhpjZbService.insertSjGfjsZsdwkhpjZb(sjGfjsZsdwkhpjZb));
+    }
+
+    /**
+     * 修改规范建设-基层单位考核评价主
+     */
+    @Log(title = "规范建设-基层单位考核评价主", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZb)
+    {
+        return toAjax(sjGfjsZsdwkhpjZbService.updateSjGfjsZsdwkhpjZb(sjGfjsZsdwkhpjZb));
+    }
+
+    /**
+     * 删除规范建设-基层单位考核评价主
+     */
+    @Log(title = "规范建设-基层单位考核评价主", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(sjGfjsZsdwkhpjZbService.deleteSjGfjsZsdwkhpjZbByIds(ids));
+    }
+}

qianhe-ydsj/src/main/java/com/qianhe/domain/SjGfjsZsdwkhpj.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_zdbf_zsdwkhpj
+ *
+ * @author qianhe
+ * @date 2024-07-24
+ */
+@Data
+public class SjGfjsZsdwkhpj 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 = "考核内容",needMerge=true)
+    private String khnr;
+
+    /** 考核项点 */
+    @Excel(name = "考核项点",needMerge=true)
+    private String khxd;
+
+
+
+    /** 评价标准名称 */
+    @Excel(name = "评价标准")
+    private String pjbzmc;
+
+    /** 数量 */
+    @Excel(name = "数量")
+    private String sj;
+
+    /** 问题描述 */
+    @Excel(name = "问题描述")
+    private String wtms;
+
+    /** 考核分值 */
+    @Excel(name = "考核结果")
+    private String khfz;
+
+    /** 预留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/domain/SjGfjsZsdwkhpjZb.java

+package com.qianhe.domain;
+
+import com.qianhe.common.annotation.Excel;
+import com.qianhe.common.core.domain.BaseEntity;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 指导帮扶-直属单位考核评价主对象 sj_zdbf_zsdwkhpj_zb
+ *
+ * @author qianhe
+ * @date 2024-07-24
+ */
+@Data
+public class SjGfjsZsdwkhpjZb extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 单位id */
+//    @Excel(name = "单位id")
+    private Long deptId;
+    @Excel(name = "直属单位名称")
+    private String parentName;
+    @Excel(name = "基层单位名称")
+    private String deptName;
+
+    /** 上级单位id */
+//    @Excel(name = "上级单位id")
+    private Long parentDeptId;
+
+    /** 年度 */
+    @Excel(name = "年度")
+    private String nd;
+
+    /** 周期范围（第一季度-第四季度、上半年、下半年） */
+//    @Excel(name = "周期范围")
+    private String zqfw;
+
+    /** 周期类型（季度、半年度、年度） */
+//    @Excel(name = "周期类型")
+    private String zqlx;
+
+    /** 级别（直属单位（半年度）、基层单位（季度）、三基帮扶组（年度）） */
+//    @Excel(name = "级别", readConverterExp = "直=属单位（半年度")
+    private String jb;
+
+    /** 单位大分类（A类基层单位、B类基层单位、C类基层单位） */
+    @Excel(name = "单位分类")
+    private String deptDfl;
+
+    /** 单位类型（采油管理区、专业化基础单位、科研基层单位、服务协调基础单位） */
+    @Excel(name = "单位类型")
+    private String deptLx;
+
+    /** 单位业务分类 */
+    @Excel(name = "单位业务分类")
+    private String deptYwfl;
+
+    /** 党建引领总分数 */
+    @Excel(name = "党建引领总分数")
+    private BigDecimal djyjzfs;
+
+    /** 党建引领扣分数 */
+    @Excel(name = "党建引领扣分数")
+    private BigDecimal djyjkfs;
+
+    /** 党建引领扣分比例 */
+    @Excel(name = "党建引领扣分比例")
+    private BigDecimal djyjkfbl;
+
+    /** 党建引领得分 */
+    @Excel(name = "党建引领得分")
+    private BigDecimal djyjdf;
+
+    /** 素质提升总分数 */
+    @Excel(name = "素质提升总分数")
+    private BigDecimal sztszfs;
+
+    /** 素质提升扣分数 */
+    @Excel(name = "素质提升扣分数")
+    private BigDecimal sztskfs;
+
+    /** 素质提升扣分比例 */
+    @Excel(name = "素质提升扣分比例")
+    private BigDecimal sztsfbl;
+
+    /** 素质提升得分 */
+    @Excel(name = "素质提升得分")
+    private BigDecimal sztsdf;
+
+    /** 管理规范总分数 */
+    @Excel(name = "管理规范总分数")
+    private BigDecimal glgfzfs;
+
+    /** 管理规范扣分数 */
+    @Excel(name = "管理规范扣分数")
+    private BigDecimal glgfkfs;
+
+    /** 管理规范扣分比例 */
+    @Excel(name = "管理规范扣分比例")
+    private BigDecimal glgfbl;
+
+    /** 管理规范得分 */
+    @Excel(name = "管理规范得分")
+    private BigDecimal glgfdf;
+
+    /** 管理规范总分数 */
+    @Excel(name = "管理规范总分数")
+    private BigDecimal ywcxzfs;
+
+    /** 管理规范扣分数 */
+    @Excel(name = "管理规范扣分数")
+    private BigDecimal ywcxkfs;
+
+    /** 管理规范扣分比例 */
+    @Excel(name = "管理规范扣分比例")
+    private BigDecimal ywcxbl;
+
+    /** 管理规范得分 */
+    @Excel(name = "管理规范得分")
+    private BigDecimal ywcxdf;
+
+    /** 发生否决项数量 */
+    @Excel(name = "发生否决项数量")
+    private BigDecimal sffjxs;
+
+    /** 总扣分 */
+    @Excel(name = "总扣分")
+    private BigDecimal zkf;
+
+    /** 总扣分比例 */
+    @Excel(name = "总扣分比例")
+    private BigDecimal zkfbl;
+
+    /** 总得分 */
+    @Excel(name = "总得分")
+    private BigDecimal zdf;
+
+    /** 综合得分 */
+    @Excel(name = "综合得分")
+    private BigDecimal zhdf;
+
+    /** 预留1 */
+//    @Excel(name = "预留1")
+    private String 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;
+
+    /**
+     * 得分查询条件
+     */
+
+    private BigDecimal df;
+
+    /**
+     * 扣分比例查询条件
+     */
+    private BigDecimal kfbl;
+
+    /**
+     * 否决项
+     */
+    private BigDecimal fjx;
+
+    /**
+     * 排名
+     */
+    private String pm;
+
+}

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

+package com.qianhe.mapper;
+
+import com.qianhe.domain.SjGfjsZsdwkhpj;
+
+import java.util.List;
+
+/**
+ * 规范建设-基层单位考核评价Mapper接口
+ *
+ * @author qianhe
+ * @date 2024-07-24
+ */
+public interface SjGfjsJcdwkhpjMapper
+{
+    /**
+     * 查询规范建设-基层单位考核评价
+     *
+     * @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 id 规范建设-基层单位考核评价主键
+     * @return 结果
+     */
+    public int deleteSjGfjsZsdwkhpjById(Long id);
+
+    /**
+     * 批量删除规范建设-基层单位考核评价
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSjGfjsZsdwkhpjByIds(Long[] ids);
+
+    int batchSave(List<SjGfjsZsdwkhpj> addList);
+
+    int pledit(List<SjGfjsZsdwkhpj> list);
+
+}

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

+package com.qianhe.mapper;
+
+import com.qianhe.domain.SjGfjsZsdwkhpjZb;
+
+import java.util.List;
+
+/**
+ * 规范建设-基层单位考核评价主Mapper接口
+ *
+ * @author qianhe
+ * @date 2024-07-24
+ */
+public interface SjGfjsJcdwkhpjZbMapper
+{
+    /**
+     * 查询规范建设-基层单位考核评价主
+     *
+     * @param id 规范建设-基层单位考核评价主主键
+     * @return 规范建设-基层单位考核评价主
+     */
+    public SjGfjsZsdwkhpjZb selectSjGfjsZsdwkhpjZbById(Long id);
+
+    /**
+     * 查询规范建设-基层单位考核评价主列表
+     *
+     * @param sjGfjsZsdwkhpjZb 规范建设-基层单位考核评价主
+     * @return 规范建设-基层单位考核评价主集合
+     */
+    public List<SjGfjsZsdwkhpjZb> selectSjGfjsZsdwkhpjZbList(SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZb);
+
+    /**
+     * 新增规范建设-基层单位考核评价主
+     *
+     * @param sjGfjsZsdwkhpjZb 规范建设-基层单位考核评价主
+     * @return 结果
+     */
+    public int insertSjGfjsZsdwkhpjZb(SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZb);
+
+    /**
+     * 修改规范建设-基层单位考核评价主
+     *
+     * @param sjGfjsZsdwkhpjZb 规范建设-基层单位考核评价主
+     * @return 结果
+     */
+    public int updateSjGfjsZsdwkhpjZb(SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZb);
+
+    /**
+     * 删除规范建设-基层单位考核评价主
+     *
+     * @param id 规范建设-基层单位考核评价主主键
+     * @return 结果
+     */
+    public int deleteSjGfjsZsdwkhpjZbById(Long id);
+
+    /**
+     * 批量删除规范建设-基层单位考核评价主
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSjGfjsZsdwkhpjZbByIds(Long[] ids);
+
+    SjGfjsZsdwkhpjZb selectSjGfjsZsdwkhpjZb(SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZb);
+
+}

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

@@ -2,7 +2,6 @@ package com.qianhe.mapper;
 
 import com.qianhe.domain.SjGfjsYdjcjl;
 import com.qianhe.domain.SjGfjsZsdwwtcj;
-import com.qianhe.domain.SjZdbfZsdwwtcj;
 
 import java.util.List;
 
@@ -84,4 +83,12 @@ public interface SjGfjsYdjcjlMapper
      * @return 结果
      */
     public int deleteSjGfjsZsdwwtcjByPid(Long id);
+
+
+
+
+
+    public List<SjGfjsZsdwwtcj> selectSjGfjsZsdwwtcjList(SjGfjsZsdwwtcj sjGfjsZsdwwtcj);
+    
+    
 }

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

+package com.qianhe.mapper;
+
+import com.qianhe.domain.SjGfjsZsdwkhpj;
+
+import java.util.List;
+
+/**
+ * 规范建设-直属单位考核评价Mapper接口
+ * 
+ * @author qianhe
+ * @date 2024-07-24
+ */
+public interface SjGfjsZsdwkhpjMapper
+{
+    /**
+     * 查询规范建设-直属单位考核评价
+     * 
+     * @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 id 规范建设-直属单位考核评价主键
+     * @return 结果
+     */
+    public int deleteSjGfjsZsdwkhpjById(Long id);
+
+    /**
+     * 批量删除规范建设-直属单位考核评价
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSjGfjsZsdwkhpjByIds(Long[] ids);
+
+    int batchSave(List<SjGfjsZsdwkhpj> addList);
+
+    int pledit(List<SjGfjsZsdwkhpj> list);
+
+}

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

+package com.qianhe.mapper;
+
+import com.qianhe.domain.SjGfjsZsdwkhpjZb;
+
+import java.util.List;
+
+/**
+ * 规范建设-直属单位考核评价主Mapper接口
+ * 
+ * @author qianhe
+ * @date 2024-07-24
+ */
+public interface SjGfjsZsdwkhpjZbMapper
+{
+    /**
+     * 查询规范建设-直属单位考核评价主
+     * 
+     * @param id 规范建设-直属单位考核评价主主键
+     * @return 规范建设-直属单位考核评价主
+     */
+    public SjGfjsZsdwkhpjZb selectSjGfjsZsdwkhpjZbById(Long id);
+
+    /**
+     * 查询规范建设-直属单位考核评价主列表
+     * 
+     * @param sjGfjsZsdwkhpjZb 规范建设-直属单位考核评价主
+     * @return 规范建设-直属单位考核评价主集合
+     */
+    public List<SjGfjsZsdwkhpjZb> selectSjGfjsZsdwkhpjZbList(SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZb);
+
+    /**
+     * 新增规范建设-直属单位考核评价主
+     * 
+     * @param sjGfjsZsdwkhpjZb 规范建设-直属单位考核评价主
+     * @return 结果
+     */
+    public int insertSjGfjsZsdwkhpjZb(SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZb);
+
+    /**
+     * 修改规范建设-直属单位考核评价主
+     * 
+     * @param sjGfjsZsdwkhpjZb 规范建设-直属单位考核评价主
+     * @return 结果
+     */
+    public int updateSjGfjsZsdwkhpjZb(SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZb);
+
+    /**
+     * 删除规范建设-直属单位考核评价主
+     * 
+     * @param id 规范建设-直属单位考核评价主主键
+     * @return 结果
+     */
+    public int deleteSjGfjsZsdwkhpjZbById(Long id);
+
+    /**
+     * 批量删除规范建设-直属单位考核评价主
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSjGfjsZsdwkhpjZbByIds(Long[] ids);
+
+    SjGfjsZsdwkhpjZb selectSjGfjsZsdwkhpjZb(SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZb);
+
+}

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

+package com.qianhe.service;
+
+import com.qianhe.domain.SjGfjsZsdwkhpj;
+
+import java.util.List;
+
+/**
+ * 规范建设-基层单位考核评价Service接口
+ *
+ * @author qianhe
+ * @date 2024-07-24
+ */
+public interface ISjGfjsJcdwkhpjService
+{
+    /**
+     * 查询规范建设-基层单位考核评价
+     *
+     * @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/ISjGfjsJcdwkhpjZbService.java

+package com.qianhe.service;
+
+import com.qianhe.domain.SjGfjsZsdwkhpjZb;
+
+import java.util.List;
+
+/**
+ * 规范建设-基层单位考核评价主Service接口
+ *
+ * @author qianhe
+ * @date 2024-07-24
+ */
+public interface ISjGfjsJcdwkhpjZbService
+{
+    /**
+     * 查询规范建设-基层单位考核评价主
+     *
+     * @param id 规范建设-基层单位考核评价主主键
+     * @return 规范建设-基层单位考核评价主
+     */
+    public SjGfjsZsdwkhpjZb selectSjGfjsZsdwkhpjZbById(Long id);
+
+    /**
+     * 查询规范建设-基层单位考核评价主列表
+     *
+     * @param sjGfjsZsdwkhpjZb 规范建设-基层单位考核评价主
+     * @return 规范建设-基层单位考核评价主集合
+     */
+    public List<SjGfjsZsdwkhpjZb> selectSjGfjsZsdwkhpjZbList(SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZb);
+
+    /**
+     * 新增规范建设-基层单位考核评价主
+     *
+     * @param sjGfjsZsdwkhpjZb 规范建设-基层单位考核评价主
+     * @return 结果
+     */
+    public int insertSjGfjsZsdwkhpjZb(SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZb);
+
+    /**
+     * 修改规范建设-基层单位考核评价主
+     *
+     * @param sjGfjsZsdwkhpjZb 规范建设-基层单位考核评价主
+     * @return 结果
+     */
+    public int updateSjGfjsZsdwkhpjZb(SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZb);
+
+    /**
+     * 批量删除规范建设-基层单位考核评价主
+     *
+     * @param ids 需要删除的规范建设-基层单位考核评价主主键集合
+     * @return 结果
+     */
+    public int deleteSjGfjsZsdwkhpjZbByIds(Long[] ids);
+
+    /**
+     * 删除规范建设-基层单位考核评价主信息
+     *
+     * @param id 规范建设-基层单位考核评价主主键
+     * @return 结果
+     */
+    public int deleteSjGfjsZsdwkhpjZbById(Long id);
+
+    SjGfjsZsdwkhpjZb selectSjGfjsZsdwkhpjZb(SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZb);
+}

qianhe-ydsj/src/main/java/com/qianhe/service/impl/SjGfjsJcdwkhpjServiceImpl.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.ISjGfjsJcdwkhpjService;
+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 SjGfjsJcdwkhpjServiceImpl implements ISjGfjsJcdwkhpjService
+{
+    @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> zdbfKhnr = sysDictDataMapper.selectDictDataByType("gfjs_sslj");
+        for(SysDictData data:zdbfKhnr){
+            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(),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 aa =  df.divide(sjGfjsZsdwkhpjZb.getSztszfs(),4,BigDecimal.ROUND_HALF_UP);
+//                BigDecimal bb =  aa.multiply(new BigDecimal(100));
+//                BigDecimal cc =  bb.setScale(2, BigDecimal.ROUND_HALF_UP);*/
+//
+//                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);
+    }
+
+
+
+}

qianhe-ydsj/src/main/java/com/qianhe/service/impl/SjGfjsJcdwkhpjZbServiceImpl.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.mapper.SjGfjsJcdwkhpjZbMapper;
+import com.qianhe.service.ISjGfjsJcdwkhpjZbService;
+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 SjGfjsJcdwkhpjZbServiceImpl implements ISjGfjsJcdwkhpjZbService
+{
+    @Autowired
+    private SjGfjsJcdwkhpjZbMapper sjGfjsZsdwkhpjZbMapper;
+
+    /**
+     * 查询规范建设-基层单位考核评价主
+     *
+     * @param id 规范建设-基层单位考核评价主主键
+     * @return 规范建设-基层单位考核评价主
+     */
+    @Override
+    public SjGfjsZsdwkhpjZb selectSjGfjsZsdwkhpjZbById(Long id)
+    {
+        return sjGfjsZsdwkhpjZbMapper.selectSjGfjsZsdwkhpjZbById(id);
+    }
+
+    /**
+     * 查询规范建设-基层单位考核评价主列表
+     *
+     * @param sjGfjsZsdwkhpjZb 规范建设-基层单位考核评价主
+     * @return 规范建设-基层单位考核评价主
+     */
+    @Override
+    @DataScope(deptAlias = "d")
+    public List<SjGfjsZsdwkhpjZb> selectSjGfjsZsdwkhpjZbList(SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZb)
+    {
+        return sjGfjsZsdwkhpjZbMapper.selectSjGfjsZsdwkhpjZbList(sjGfjsZsdwkhpjZb);
+    }
+
+    /**
+     * 新增规范建设-基层单位考核评价主
+     *
+     * @param sjGfjsZsdwkhpjZb 规范建设-基层单位考核评价主
+     * @return 结果
+     */
+    @Override
+    public int insertSjGfjsZsdwkhpjZb(SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZb)
+    {
+        sjGfjsZsdwkhpjZb.setCreateTime(DateUtils.getNowDate());
+        return sjGfjsZsdwkhpjZbMapper.insertSjGfjsZsdwkhpjZb(sjGfjsZsdwkhpjZb);
+    }
+
+    /**
+     * 修改规范建设-基层单位考核评价主
+     *
+     * @param sjGfjsZsdwkhpjZb 规范建设-基层单位考核评价主
+     * @return 结果
+     */
+    @Override
+    public int updateSjGfjsZsdwkhpjZb(SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZb)
+    {
+        sjGfjsZsdwkhpjZb.setUpdateTime(DateUtils.getNowDate());
+        return sjGfjsZsdwkhpjZbMapper.updateSjGfjsZsdwkhpjZb(sjGfjsZsdwkhpjZb);
+    }
+
+    /**
+     * 批量删除规范建设-基层单位考核评价主
+     *
+     * @param ids 需要删除的规范建设-基层单位考核评价主主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSjGfjsZsdwkhpjZbByIds(Long[] ids)
+    {
+        return sjGfjsZsdwkhpjZbMapper.deleteSjGfjsZsdwkhpjZbByIds(ids);
+    }
+
+    /**
+     * 删除规范建设-基层单位考核评价主信息
+     *
+     * @param id 规范建设-基层单位考核评价主主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSjGfjsZsdwkhpjZbById(Long id)
+    {
+        return sjGfjsZsdwkhpjZbMapper.deleteSjGfjsZsdwkhpjZbById(id);
+    }
+
+    @Override
+    public SjGfjsZsdwkhpjZb selectSjGfjsZsdwkhpjZb(SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZb) {
+        return sjGfjsZsdwkhpjZbMapper.selectSjGfjsZsdwkhpjZb(sjGfjsZsdwkhpjZb);
+    }
+}

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

@@ -62,6 +62,15 @@ public class SjGfjsYdjcjlServiceImpl implements ISjGfjsYdjcjlService
     {
         sjGfjsYdjcjl.setCreateTime(DateUtils.getNowDate());
         sjGfjsYdjcjl.setCreateBy(SecurityUtils.getUsername());
+
+        //判断是否有问题
+        List<SjGfjsZsdwwtcj> sjGfjsZsdwwtcjList = sjGfjsYdjcjl.getSjGfjsZsdwwtcjList();
+        if(sjGfjsZsdwwtcjList != null && sjGfjsZsdwwtcjList.size() > 0){
+            sjGfjsYdjcjl.setSfczwt("Y");
+        } else {
+            sjGfjsYdjcjl.setSfczwt("N");
+        }
+
         int rows = sjGfjsYdjcjlMapper.insertSjGfjsYdjcjl(sjGfjsYdjcjl);
         insertSjGfjsZsdwwtcj(sjGfjsYdjcjl);
         return rows;
@@ -83,6 +92,14 @@ public class SjGfjsYdjcjlServiceImpl implements ISjGfjsYdjcjlService
         sjGfjsYdjcjlMapper.deleteSjGfjsZsdwwtcjByPid(sjGfjsYdjcjl.getId());
         insertSjGfjsZsdwwtcj(sjGfjsYdjcjl);
 
+        //判断是否有问题
+        List<SjGfjsZsdwwtcj> sjGfjsZsdwwtcjList = sjGfjsYdjcjl.getSjGfjsZsdwwtcjList();
+        if(sjGfjsZsdwwtcjList != null && sjGfjsZsdwwtcjList.size() > 0){
+            sjGfjsYdjcjl.setSfczwt("Y");
+        } else {
+            sjGfjsYdjcjl.setSfczwt("N");
+        }
+
         return sjGfjsYdjcjlMapper.updateSjGfjsYdjcjl(sjGfjsYdjcjl);
     }
 
@@ -127,6 +144,11 @@ public class SjGfjsYdjcjlServiceImpl implements ISjGfjsYdjcjlService
             for (SjGfjsZsdwwtcj sjGfjsZsdwwtcj : sjGfjsZsdwwtcjList)
             {
                 sjGfjsZsdwwtcj.setPid(id);
+
+                sjGfjsZsdwwtcj.setDeptId(sjGfjsYdjcjl.getDeptId());
+                sjGfjsZsdwwtcj.setRq(sjGfjsYdjcjl.getRq());
+                sjGfjsZsdwwtcj.setJcjb(sjGfjsYdjcjl.getJcjb());
+
                 sjGfjsZsdwwtcj.setCreateTime(DateUtils.getNowDate());
                 sjGfjsZsdwwtcj.setCreateBy(SecurityUtils.getUsername());
                 list.add(sjGfjsZsdwwtcj);

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

+package com.qianhe.service.impl;
+
+import com.qianhe.common.annotation.DataScope;
+import com.qianhe.common.utils.DateUtils;
+import com.qianhe.domain.SjZdbfZsdwkhpjZb;
+import com.qianhe.mapper.SjZdbfZsdwkhpjZbMapper;
+import com.qianhe.service.ISjZdbfZsdwkhpjZbService;
+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 SjGfjsZsdwkhpjZbServiceImpl implements ISjZdbfZsdwkhpjZbService
+{
+    @Autowired
+    private SjZdbfZsdwkhpjZbMapper sjZdbfZsdwkhpjZbMapper;
+
+    /**
+     * 查询指导帮扶-直属单位考核评价主
+     *
+     * @param id 指导帮扶-直属单位考核评价主主键
+     * @return 指导帮扶-直属单位考核评价主
+     */
+    @Override
+    public SjZdbfZsdwkhpjZb selectSjZdbfZsdwkhpjZbById(Long id)
+    {
+        return sjZdbfZsdwkhpjZbMapper.selectSjZdbfZsdwkhpjZbById(id);
+    }
+
+    /**
+     * 查询指导帮扶-直属单位考核评价主列表
+     *
+     * @param sjZdbfZsdwkhpjZb 指导帮扶-直属单位考核评价主
+     * @return 指导帮扶-直属单位考核评价主
+     */
+    @Override
+    @DataScope(deptAlias = "d")
+    public List<SjZdbfZsdwkhpjZb> selectSjZdbfZsdwkhpjZbList(SjZdbfZsdwkhpjZb sjZdbfZsdwkhpjZb)
+    {
+        return sjZdbfZsdwkhpjZbMapper.selectSjZdbfZsdwkhpjZbList(sjZdbfZsdwkhpjZb);
+    }
+
+    /**
+     * 新增指导帮扶-直属单位考核评价主
+     *
+     * @param sjZdbfZsdwkhpjZb 指导帮扶-直属单位考核评价主
+     * @return 结果
+     */
+    @Override
+    public int insertSjZdbfZsdwkhpjZb(SjZdbfZsdwkhpjZb sjZdbfZsdwkhpjZb)
+    {
+        sjZdbfZsdwkhpjZb.setCreateTime(DateUtils.getNowDate());
+        return sjZdbfZsdwkhpjZbMapper.insertSjZdbfZsdwkhpjZb(sjZdbfZsdwkhpjZb);
+    }
+
+    /**
+     * 修改指导帮扶-直属单位考核评价主
+     *
+     * @param sjZdbfZsdwkhpjZb 指导帮扶-直属单位考核评价主
+     * @return 结果
+     */
+    @Override
+    public int updateSjZdbfZsdwkhpjZb(SjZdbfZsdwkhpjZb sjZdbfZsdwkhpjZb)
+    {
+        sjZdbfZsdwkhpjZb.setUpdateTime(DateUtils.getNowDate());
+        return sjZdbfZsdwkhpjZbMapper.updateSjZdbfZsdwkhpjZb(sjZdbfZsdwkhpjZb);
+    }
+
+    /**
+     * 批量删除指导帮扶-直属单位考核评价主
+     *
+     * @param ids 需要删除的指导帮扶-直属单位考核评价主主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSjZdbfZsdwkhpjZbByIds(Long[] ids)
+    {
+        return sjZdbfZsdwkhpjZbMapper.deleteSjZdbfZsdwkhpjZbByIds(ids);
+    }
+
+    /**
+     * 删除指导帮扶-直属单位考核评价主信息
+     *
+     * @param id 指导帮扶-直属单位考核评价主主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSjZdbfZsdwkhpjZbById(Long id)
+    {
+        return sjZdbfZsdwkhpjZbMapper.deleteSjZdbfZsdwkhpjZbById(id);
+    }
+
+    @Override
+    public SjZdbfZsdwkhpjZb selectSjZdbfZsdwkhpjZb(SjZdbfZsdwkhpjZb sjZdbfZsdwkhpjZb) {
+        return sjZdbfZsdwkhpjZbMapper.selectSjZdbfZsdwkhpjZb(sjZdbfZsdwkhpjZb);
+    }
+}

qianhe-ydsj/src/main/resources/mapper/SjGfjsJcdwkhpjMapper.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.SjGfjsJcdwkhpjMapper">
+
+    <resultMap type="SjGfjsZsdwkhpj" id="SjGfjsZsdwkhpjResult">
+        <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="khnr"    column="khnr"    />
+        <result property="khxd"    column="khxd"    />
+        <result property="pjbzid"    column="pjbzid"    />
+        <result property="pjbzmc"    column="pjbzmc"    />
+        <result property="sj"    column="sj"    />
+        <result property="wtms"    column="wtms"    />
+        <result property="khfz"    column="khfz"    />
+        <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="selectSjGfjsZsdwkhpjVo">
+        select id,
+               zb_id,
+               a.dept_id,
+               nd,
+               zqfw,
+               zqlx,
+               jb,
+               khnr,
+               khxd,
+               pjbzid,
+               pjbzmc,
+               sj,
+               wtms,
+               khfz,
+               a.create_by,
+               a.create_time,
+               a.update_by,
+               a.update_time,
+               remark,
+               yl1,
+               yl2,
+               yl3,
+               yl4,
+               yl5,d.dept_name
+        from sj_gfjs_zsdwkhpj a
+                 left join  sys_dept d on a.dept_id=d.dept_id
+</sql>
+
+    <select id="selectSjGfjsZsdwkhpjList" parameterType="SjGfjsZsdwkhpj" resultMap="SjGfjsZsdwkhpjResult">
+        <include refid="selectSjGfjsZsdwkhpjVo"/>
+        <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="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="sj != null  and sj != ''"> and sj = #{sj}</if>
+            <if test="wtms != null  and wtms != ''"> and wtms = #{wtms}</if>
+            <if test="khfz != null  and khfz != ''"> and khfz = #{khfz}</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="selectSjGfjsZsdwkhpjById" parameterType="Long" resultMap="SjGfjsZsdwkhpjResult">
+        <include refid="selectSjGfjsZsdwkhpjVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertSjGfjsZsdwkhpj" parameterType="SjGfjsZsdwkhpj" useGeneratedKeys="true" keyProperty="id">
+        insert into sj_gfjs_zsdwkhpj
+        <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="khnr != null">khnr,</if>
+            <if test="khxd != null">khxd,</if>
+            <if test="pjbzid != null">pjbzid,</if>
+            <if test="pjbzmc != null">pjbzmc,</if>
+            <if test="sj != null">sj,</if>
+            <if test="wtms != null">wtms,</if>
+            <if test="khfz != null">khfz,</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="khnr != null">#{khnr},</if>
+            <if test="khxd != null">#{khxd},</if>
+            <if test="pjbzid != null">#{pjbzid},</if>
+            <if test="pjbzmc != null">#{pjbzmc},</if>
+            <if test="sj != null">#{sj},</if>
+            <if test="wtms != null">#{wtms},</if>
+            <if test="khfz != null">#{khfz},</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_zsdwkhpj( id, zb_id, dept_id, nd, zqfw, zqlx, jb, khnr, khxd, pjbzid, pjbzmc, sj, wtms, khfz, 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.khnr}, #{item.khxd}, #{item.pjbzid}, #{item.pjbzmc}, #{item.sj}, #{item.wtms}, #{item.khfz},  #{item.remark}, #{item.yl1}, #{item.yl2}, #{item.yl3}, #{item.yl4}, #{item.yl5})
+        </foreach>
+    </insert>
+
+    <update id="updateSjGfjsZsdwkhpj" parameterType="SjGfjsZsdwkhpj">
+        update sj_gfjs_zsdwkhpj
+        <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="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="sj != null">sj = #{sj},</if>
+            <if test="wtms != null">wtms = #{wtms},</if>
+            <if test="khfz != null">khfz = #{khfz},</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" open="" close="" separator=";">
+            update sj_gfjs_zsdwkhpj
+            <trim prefix="SET" suffixOverrides=",">
+                <if test="item.sj != null">sj = #{item.sj},</if>
+                <if test="item.wtms != null">wtms = #{item.wtms},</if>
+                <if test="item.khfz != null">khfz = #{item.khfz},</if>
+            </trim>
+            where id = #{item.id}
+        </foreach>
+    </update>
+
+    <delete id="deleteSjGfjsZsdwkhpjById" parameterType="Long">
+        delete from sj_gfjs_zsdwkhpj where id = #{id}
+    </delete>
+
+    <delete id="deleteSjGfjsZsdwkhpjByIds" parameterType="String">
+        delete from sj_gfjs_zsdwkhpj where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -205,4 +205,59 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ( #{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.updateBy}, #{item.updateTime}, #{item.remark}, #{item.yl1}, #{item.yl2}, #{item.yl3}, #{item.yl4}, #{item.yl5}, #{item.pid})
         </foreach>
     </insert>
+
+
+
+    <select id="selectSjGfjsZsdwwtcjList" parameterType="SjGfjsZsdwwtcj" resultMap="SjGfjsZsdwwtcjResult">
+        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,
+        yl3,
+        yl4,
+        yl5, d.dept_name,d.dept_lx
+        from sj_zdbf_zsdwwtcj a
+        left join sys_dept d on a.dept_id=d.dept_id
+        <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>
+    
 </mapper>