修改问题

qianhe-admin/src/main/java/com/qianhe/web/controller/system/SysDeptFlController.java

+package com.qianhe.web.controller.system;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.qianhe.system.domain.SysDeptFl;
+import com.qianhe.system.service.ISysDeptFlService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.qianhe.common.annotation.Log;
+import com.qianhe.common.core.controller.BaseController;
+import com.qianhe.common.core.domain.AjaxResult;
+import com.qianhe.common.enums.BusinessType;
+
+import com.qianhe.common.utils.poi.ExcelUtil;
+import com.qianhe.common.core.page.TableDataInfo;
+
+/**
+ * 单位分类Controller
+ *
+ * @author qianhe
+ * @date 2024-07-22
+ */
+@RestController
+@RequestMapping("/system/sysDeptFl")
+public class SysDeptFlController extends BaseController
+{
+    @Autowired
+    private ISysDeptFlService sysDeptFlService;
+
+    /**
+     * 查询单位分类列表
+     */
+//    @PreAuthorize("@ss.hasPermi('system:sysDeptFl:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysDeptFl sysDeptFl)
+    {
+//        startPage();
+        List<SysDeptFl> list = sysDeptFlService.selectSysDeptFlList(sysDeptFl);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出单位分类列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:sysDeptFl:export')")
+    @Log(title = "单位分类", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SysDeptFl sysDeptFl)
+    {
+        List<SysDeptFl> list = sysDeptFlService.selectSysDeptFlList(sysDeptFl);
+        ExcelUtil<SysDeptFl> util = new ExcelUtil<SysDeptFl>(SysDeptFl.class);
+        util.exportExcel(response, list, "单位分类数据");
+    }
+
+    /**
+     * 获取单位分类详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:sysDeptFl:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(sysDeptFlService.selectSysDeptFlById(id));
+    }
+
+    /**
+     * 新增单位分类
+     */
+    @PreAuthorize("@ss.hasPermi('system:sysDeptFl:add')")
+    @Log(title = "单位分类", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SysDeptFl sysDeptFl)
+    {
+        return toAjax(sysDeptFlService.insertSysDeptFl(sysDeptFl));
+    }
+
+    /**
+     * 修改单位分类
+     */
+    @PreAuthorize("@ss.hasPermi('system:sysDeptFl:edit')")
+    @Log(title = "单位分类", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SysDeptFl sysDeptFl)
+    {
+        return toAjax(sysDeptFlService.updateSysDeptFl(sysDeptFl));
+    }
+
+    /**
+     * 删除单位分类
+     */
+    @PreAuthorize("@ss.hasPermi('system:sysDeptFl:remove')")
+    @Log(title = "单位分类", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(sysDeptFlService.deleteSysDeptFlByIds(ids));
+    }
+}

qianhe-common/src/main/java/com/qianhe/common/core/domain/entity/SysDept.java

@@ -58,6 +58,18 @@ public class SysDept extends BaseEntity
 
 
     private String dwjb;
     private String dwjb;
 
 
+    /** 单位类型（采油管理区、专业化基础单位、科研基层单位、服务协调基础单位） */
+//    @Excel(name = "单位类型", readConverterExp = "采=油管理区、专业化基础单位、科研基层单位、服务协调基础单位")
+    private String deptLx;
+
+    /** 单位大分类（A类基层单位、B类基层单位、C类基层单位） */
+//    @Excel(name = "单位大分类", readConverterExp = "A=类基层单位、B类基层单位、C类基层单位")
+    private String deptDfl;
+
+    /** 单位业务分类 */
+//    @Excel(name = "单位业务分类")
+    private String deptYwfl;
+
     /** 子部门 */
     /** 子部门 */
     private List<SysDept> children = new ArrayList<SysDept>();
     private List<SysDept> children = new ArrayList<SysDept>();
 
 

qianhe-system/src/main/java/com/qianhe/system/domain/SysDeptFl.java

+package com.qianhe.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.qianhe.common.annotation.Excel;
+import com.qianhe.common.core.domain.BaseEntity;
+
+/**
+ * 单位分类对象 sys_dept_fl
+ *
+ * @author qianhe
+ * @date 2024-07-22
+ */
+public class SysDeptFl extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 类型名称 */
+    @Excel(name = "类型名称")
+    private String lxmc;
+
+    /** 类型值 */
+    @Excel(name = "类型值")
+    private String lxz;
+
+    /** 上级类型 */
+    @Excel(name = "上级类型")
+    private String sjlx;
+
+    /** 预留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;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setLxmc(String lxmc)
+    {
+        this.lxmc = lxmc;
+    }
+
+    public String getLxmc()
+    {
+        return lxmc;
+    }
+    public void setLxz(String lxz)
+    {
+        this.lxz = lxz;
+    }
+
+    public String getLxz()
+    {
+        return lxz;
+    }
+    public void setSjlx(String sjlx)
+    {
+        this.sjlx = sjlx;
+    }
+
+    public String getSjlx()
+    {
+        return sjlx;
+    }
+    public void setYl1(String yl1)
+    {
+        this.yl1 = yl1;
+    }
+
+    public String getYl1()
+    {
+        return yl1;
+    }
+    public void setYl2(String yl2)
+    {
+        this.yl2 = yl2;
+    }
+
+    public String getYl2()
+    {
+        return yl2;
+    }
+    public void setYl3(String yl3)
+    {
+        this.yl3 = yl3;
+    }
+
+    public String getYl3()
+    {
+        return yl3;
+    }
+    public void setYl4(String yl4)
+    {
+        this.yl4 = yl4;
+    }
+
+    public String getYl4()
+    {
+        return yl4;
+    }
+    public void setYl5(String yl5)
+    {
+        this.yl5 = yl5;
+    }
+
+    public String getYl5()
+    {
+        return yl5;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("lxmc", getLxmc())
+            .append("lxz", getLxz())
+            .append("sjlx", getSjlx())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .append("yl1", getYl1())
+            .append("yl2", getYl2())
+            .append("yl3", getYl3())
+            .append("yl4", getYl4())
+            .append("yl5", getYl5())
+            .toString();
+    }
+}

qianhe-system/src/main/java/com/qianhe/system/mapper/SysDeptFlMapper.java

+package com.qianhe.system.mapper;
+
+import java.util.List;
+import com.qianhe.system.domain.SysDeptFl;
+
+/**
+ * 单位分类Mapper接口
+ * 
+ * @author qianhe
+ * @date 2024-07-22
+ */
+public interface SysDeptFlMapper 
+{
+    /**
+     * 查询单位分类
+     * 
+     * @param id 单位分类主键
+     * @return 单位分类
+     */
+    public SysDeptFl selectSysDeptFlById(Long id);
+
+    /**
+     * 查询单位分类列表
+     * 
+     * @param sysDeptFl 单位分类
+     * @return 单位分类集合
+     */
+    public List<SysDeptFl> selectSysDeptFlList(SysDeptFl sysDeptFl);
+
+    /**
+     * 新增单位分类
+     * 
+     * @param sysDeptFl 单位分类
+     * @return 结果
+     */
+    public int insertSysDeptFl(SysDeptFl sysDeptFl);
+
+    /**
+     * 修改单位分类
+     * 
+     * @param sysDeptFl 单位分类
+     * @return 结果
+     */
+    public int updateSysDeptFl(SysDeptFl sysDeptFl);
+
+    /**
+     * 删除单位分类
+     * 
+     * @param id 单位分类主键
+     * @return 结果
+     */
+    public int deleteSysDeptFlById(Long id);
+
+    /**
+     * 批量删除单位分类
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSysDeptFlByIds(Long[] ids);
+}

qianhe-system/src/main/java/com/qianhe/system/service/ISysDeptFlService.java

+package com.qianhe.system.service;
+
+import java.util.List;
+import com.qianhe.system.domain.SysDeptFl;
+
+/**
+ * 单位分类Service接口
+ * 
+ * @author qianhe
+ * @date 2024-07-22
+ */
+public interface ISysDeptFlService 
+{
+    /**
+     * 查询单位分类
+     * 
+     * @param id 单位分类主键
+     * @return 单位分类
+     */
+    public SysDeptFl selectSysDeptFlById(Long id);
+
+    /**
+     * 查询单位分类列表
+     * 
+     * @param sysDeptFl 单位分类
+     * @return 单位分类集合
+     */
+    public List<SysDeptFl> selectSysDeptFlList(SysDeptFl sysDeptFl);
+
+    /**
+     * 新增单位分类
+     * 
+     * @param sysDeptFl 单位分类
+     * @return 结果
+     */
+    public int insertSysDeptFl(SysDeptFl sysDeptFl);
+
+    /**
+     * 修改单位分类
+     * 
+     * @param sysDeptFl 单位分类
+     * @return 结果
+     */
+    public int updateSysDeptFl(SysDeptFl sysDeptFl);
+
+    /**
+     * 批量删除单位分类
+     * 
+     * @param ids 需要删除的单位分类主键集合
+     * @return 结果
+     */
+    public int deleteSysDeptFlByIds(Long[] ids);
+
+    /**
+     * 删除单位分类信息
+     * 
+     * @param id 单位分类主键
+     * @return 结果
+     */
+    public int deleteSysDeptFlById(Long id);
+}

qianhe-system/src/main/java/com/qianhe/system/service/impl/SysDeptFlServiceImpl.java

+package com.qianhe.system.service.impl;
+
+import java.util.List;
+import com.qianhe.common.utils.DateUtils;
+import com.qianhe.system.domain.SysDeptFl;
+import com.qianhe.system.mapper.SysDeptFlMapper;
+import com.qianhe.system.service.ISysDeptFlService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 单位分类Service业务层处理
+ *
+ * @author qianhe
+ * @date 2024-07-22
+ */
+@Service
+public class SysDeptFlServiceImpl implements ISysDeptFlService
+{
+    @Autowired
+    private SysDeptFlMapper sysDeptFlMapper;
+
+    /**
+     * 查询单位分类
+     *
+     * @param id 单位分类主键
+     * @return 单位分类
+     */
+    @Override
+    public SysDeptFl selectSysDeptFlById(Long id)
+    {
+        return sysDeptFlMapper.selectSysDeptFlById(id);
+    }
+
+    /**
+     * 查询单位分类列表
+     *
+     * @param sysDeptFl 单位分类
+     * @return 单位分类
+     */
+    @Override
+    public List<SysDeptFl> selectSysDeptFlList(SysDeptFl sysDeptFl)
+    {
+        return sysDeptFlMapper.selectSysDeptFlList(sysDeptFl);
+    }
+
+    /**
+     * 新增单位分类
+     *
+     * @param sysDeptFl 单位分类
+     * @return 结果
+     */
+    @Override
+    public int insertSysDeptFl(SysDeptFl sysDeptFl)
+    {
+        sysDeptFl.setCreateTime(DateUtils.getNowDate());
+        return sysDeptFlMapper.insertSysDeptFl(sysDeptFl);
+    }
+
+    /**
+     * 修改单位分类
+     *
+     * @param sysDeptFl 单位分类
+     * @return 结果
+     */
+    @Override
+    public int updateSysDeptFl(SysDeptFl sysDeptFl)
+    {
+        sysDeptFl.setUpdateTime(DateUtils.getNowDate());
+        return sysDeptFlMapper.updateSysDeptFl(sysDeptFl);
+    }
+
+    /**
+     * 批量删除单位分类
+     *
+     * @param ids 需要删除的单位分类主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSysDeptFlByIds(Long[] ids)
+    {
+        return sysDeptFlMapper.deleteSysDeptFlByIds(ids);
+    }
+
+    /**
+     * 删除单位分类信息
+     *
+     * @param id 单位分类主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSysDeptFlById(Long id)
+    {
+        return sysDeptFlMapper.deleteSysDeptFlById(id);
+    }
+}

qianhe-system/src/main/resources/mapper/system/SysDeptFlMapper.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.system.mapper.SysDeptFlMapper">
+    
+    <resultMap type="SysDeptFl" id="SysDeptFlResult">
+        <result property="id"    column="id"    />
+        <result property="lxmc"    column="lxmc"    />
+        <result property="lxz"    column="lxz"    />
+        <result property="sjlx"    column="sjlx"    />
+        <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"    />
+    </resultMap>
+
+    <sql id="selectSysDeptFlVo">
+        select id, lxmc, lxz, sjlx, create_by, create_time, update_by, update_time, remark, yl1, yl2, yl3, yl4, yl5 from sys_dept_fl
+    </sql>
+
+    <select id="selectSysDeptFlList" parameterType="SysDeptFl" resultMap="SysDeptFlResult">
+        <include refid="selectSysDeptFlVo"/>
+        <where>  
+            <if test="lxmc != null  and lxmc != ''"> and lxmc = #{lxmc}</if>
+            <if test="lxz != null  and lxz != ''"> and lxz = #{lxz}</if>
+            <if test="sjlx != null  and sjlx != ''"> and sjlx = #{sjlx}</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>
+        </where>
+    </select>
+    
+    <select id="selectSysDeptFlById" parameterType="Long" resultMap="SysDeptFlResult">
+        <include refid="selectSysDeptFlVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertSysDeptFl" parameterType="SysDeptFl" useGeneratedKeys="true" keyProperty="id">
+        insert into sys_dept_fl
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="lxmc != null">lxmc,</if>
+            <if test="lxz != null">lxz,</if>
+            <if test="sjlx != null">sjlx,</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="lxmc != null">#{lxmc},</if>
+            <if test="lxz != null">#{lxz},</if>
+            <if test="sjlx != null">#{sjlx},</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>
+
+    <update id="updateSysDeptFl" parameterType="SysDeptFl">
+        update sys_dept_fl
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="lxmc != null">lxmc = #{lxmc},</if>
+            <if test="lxz != null">lxz = #{lxz},</if>
+            <if test="sjlx != null">sjlx = #{sjlx},</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="deleteSysDeptFlById" parameterType="Long">
+        delete from sys_dept_fl where id = #{id}
+    </delete>
+
+    <delete id="deleteSysDeptFlByIds" parameterType="String">
+        delete from sys_dept_fl where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

qianhe-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -21,13 +21,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="updateBy"   column="update_by"   />
 		<result property="updateBy"   column="update_by"   />
 		<result property="updateTime" column="update_time" />
 		<result property="updateTime" column="update_time" />
 		<result property="dwjb" column="dwjb" />
 		<result property="dwjb" column="dwjb" />
+		<result property="deptLx"    column="dept_lx"    />
+		<result property="deptDfl"    column="dept_dfl"    />
+		<result property="deptYwfl"    column="dept_ywfl"    />
 	</resultMap>
 	</resultMap>
 
 
 	<sql id="selectDeptVo">
 	<sql id="selectDeptVo">
         select d.dept_id, d.parent_id,
         select d.dept_id, d.parent_id,
                d.ancestors, d.dept_name,
                d.ancestors, d.dept_name,
                d.order_num, d.leader, d.phone,
                d.order_num, d.leader, d.phone,
-               d.email, d.status, d.del_flag, d.create_by, d.create_time,d.dwjb
+               d.email, d.status, d.del_flag, d.create_by, d.create_time,d.dwjb, d.dept_lx, d.dept_dfl, d.dept_ywfl
         from sys_dept d
         from sys_dept d
     </sql>
     </sql>
 
 
@@ -67,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="selectDeptById" parameterType="Long" resultMap="SysDeptResult">
     <select id="selectDeptById" parameterType="Long" resultMap="SysDeptResult">
 		select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status,
 		select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status,
-			(select dept_name from sys_dept where dept_id = d.parent_id) parent_name
+			(select dept_name from sys_dept where dept_id = d.parent_id) parent_name,d.dwjb, d.dept_lx, d.dept_dfl, d.dept_ywfl
 		from sys_dept d
 		from sys_dept d
 		where d.dept_id = #{deptId}
 		where d.dept_id = #{deptId}
 	</select>
 	</select>
@@ -107,6 +110,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="status != null">status,</if>
  			<if test="status != null">status,</if>
  			<if test="createBy != null and createBy != ''">create_by,</if>
  			<if test="createBy != null and createBy != ''">create_by,</if>
  			<if test="dwjb != null and dwjb != ''">dwjb,</if>
  			<if test="dwjb != null and dwjb != ''">dwjb,</if>
+			<if test="deptLx != null">dept_lx,</if>
+			<if test="deptDfl != null">dept_dfl,</if>
+			<if test="deptYwfl != null">dept_ywfl,</if>
  			create_time
  			create_time
  		)values(
  		)values(
  			<if test="deptId != null and deptId != 0">#{deptId},</if>
  			<if test="deptId != null and deptId != 0">#{deptId},</if>
@@ -120,6 +126,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="status != null">#{status},</if>
  			<if test="status != null">#{status},</if>
  			<if test="createBy != null and createBy != ''">#{createBy},</if>
  			<if test="createBy != null and createBy != ''">#{createBy},</if>
  			<if test="dwjb != null and dwjb != ''">#{dwjb},</if>
  			<if test="dwjb != null and dwjb != ''">#{dwjb},</if>
+			<if test="deptLx != null">#{deptLx},</if>
+			<if test="deptDfl != null">#{deptDfl},</if>
+			<if test="deptYwfl != null">#{deptYwfl},</if>
  			sysdate()
  			sysdate()
  		)
  		)
 	</insert>
 	</insert>
@@ -137,6 +146,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="status != null and status != ''">status = #{status},</if>
  			<if test="status != null and status != ''">status = #{status},</if>
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
  			<if test="dwjb != null and dwjb != ''">dwjb = #{dwjb},</if>
  			<if test="dwjb != null and dwjb != ''">dwjb = #{dwjb},</if>
+			<if test="deptLx != null">dept_lx = #{deptLx},</if>
+			<if test="deptDfl != null">dept_dfl = #{deptDfl},</if>
+			<if test="deptYwfl != null">dept_ywfl = #{deptYwfl},</if>
  			update_time = sysdate()
  			update_time = sysdate()
  		</set>
  		</set>
  		where dept_id = #{deptId}
  		where dept_id = #{deptId}

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

+package com.qianhe.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.qianhe.common.annotation.Log;
+import com.qianhe.common.core.controller.BaseController;
+import com.qianhe.common.core.domain.AjaxResult;
+import com.qianhe.common.enums.BusinessType;
+import com.qianhe.domain.SjZdbfFjxbz;
+import com.qianhe.service.ISjZdbfFjxbzService;
+import com.qianhe.common.utils.poi.ExcelUtil;
+import com.qianhe.common.core.page.TableDataInfo;
+
+/**
+ * 指导帮扶-否决项标准Controller
+ *
+ * @author qianhe
+ * @date 2024-07-22
+ */
+@RestController
+@RequestMapping("/system/sjZdbfFjxbz")
+public class SjZdbfFjxbzController extends BaseController
+{
+    @Autowired
+    private ISjZdbfFjxbzService sjZdbfFjxbzService;
+
+    /**
+     * 查询指导帮扶-否决项标准列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:sjZdbfFjxbz:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SjZdbfFjxbz sjZdbfFjxbz)
+    {
+        startPage();
+        List<SjZdbfFjxbz> list = sjZdbfFjxbzService.selectSjZdbfFjxbzList(sjZdbfFjxbz);
+        return getDataTable(list);
+    }
+    /**
+     * 查询指导帮扶-否决项标准列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:sjZdbfFjxbz:cxlist')")
+    @GetMapping("/cxlist")
+    public TableDataInfo cxlist(SjZdbfFjxbz sjZdbfFjxbz)
+    {
+        startPage();
+        List<SjZdbfFjxbz> list = sjZdbfFjxbzService.selectSjZdbfFjxbzCxList(sjZdbfFjxbz);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出指导帮扶-否决项标准列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:sjZdbfFjxbz:export')")
+    @Log(title = "指导帮扶-否决项标准", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SjZdbfFjxbz sjZdbfFjxbz)
+    {
+        List<SjZdbfFjxbz> list = sjZdbfFjxbzService.selectSjZdbfFjxbzList(sjZdbfFjxbz);
+        ExcelUtil<SjZdbfFjxbz> util = new ExcelUtil<SjZdbfFjxbz>(SjZdbfFjxbz.class);
+        util.exportExcel(response, list, "指导帮扶-否决项标准数据");
+    }
+
+    /**
+     * 获取指导帮扶-否决项标准详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:sjZdbfFjxbz:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(sjZdbfFjxbzService.selectSjZdbfFjxbzById(id));
+    }
+
+    /**
+     * 新增指导帮扶-否决项标准
+     */
+    @PreAuthorize("@ss.hasPermi('system:sjZdbfFjxbz:add')")
+    @Log(title = "指导帮扶-否决项标准", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SjZdbfFjxbz sjZdbfFjxbz)
+    {
+        return toAjax(sjZdbfFjxbzService.insertSjZdbfFjxbz(sjZdbfFjxbz));
+    }
+
+    /**
+     * 修改指导帮扶-否决项标准
+     */
+    @PreAuthorize("@ss.hasPermi('system:sjZdbfFjxbz:edit')")
+    @Log(title = "指导帮扶-否决项标准", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SjZdbfFjxbz sjZdbfFjxbz)
+    {
+        return toAjax(sjZdbfFjxbzService.updateSjZdbfFjxbz(sjZdbfFjxbz));
+    }
+
+    /**
+     * 删除指导帮扶-否决项标准
+     */
+    @PreAuthorize("@ss.hasPermi('system:sjZdbfFjxbz:remove')")
+    @Log(title = "指导帮扶-否决项标准", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(sjZdbfFjxbzService.deleteSjZdbfFjxbzByIds(ids));
+    }
+}

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

+package com.qianhe.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.qianhe.common.annotation.Log;
+import com.qianhe.common.core.controller.BaseController;
+import com.qianhe.common.core.domain.AjaxResult;
+import com.qianhe.common.enums.BusinessType;
+import com.qianhe.domain.SjZdbfKhpjbz;
+import com.qianhe.service.ISjZdbfKhpjbzService;
+import com.qianhe.common.utils.poi.ExcelUtil;
+import com.qianhe.common.core.page.TableDataInfo;
+
+/**
+ * 指导帮扶-考核评价标准Controller
+ *
+ * @author qianhe
+ * @date 2024-07-22
+ */
+@RestController
+@RequestMapping("/system/sjZdbfKhpjbz")
+public class SjZdbfKhpjbzController extends BaseController
+{
+    @Autowired
+    private ISjZdbfKhpjbzService sjZdbfKhpjbzService;
+
+    /**
+     * 查询指导帮扶-考核评价标准列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:sjZdbfKhpjbz:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SjZdbfKhpjbz sjZdbfKhpjbz)
+    {
+        startPage();
+        List<SjZdbfKhpjbz> list = sjZdbfKhpjbzService.selectSjZdbfKhpjbzList(sjZdbfKhpjbz);
+        return getDataTable(list);
+    }
+
+
+    /**
+     * 查询指导帮扶-考核评价标准列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:sjZdbfKhpjbz:cxlist')")
+    @GetMapping("/cxlist")
+    public TableDataInfo cxlist(SjZdbfKhpjbz sjZdbfKhpjbz)
+    {
+        startPage();
+        List<SjZdbfKhpjbz> list = sjZdbfKhpjbzService.selectSjZdbfKhpjbzCxList(sjZdbfKhpjbz);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出指导帮扶-考核评价标准列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:sjZdbfKhpjbz:export')")
+    @Log(title = "指导帮扶-考核评价标准", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SjZdbfKhpjbz sjZdbfKhpjbz)
+    {
+        List<SjZdbfKhpjbz> list = sjZdbfKhpjbzService.selectSjZdbfKhpjbzList(sjZdbfKhpjbz);
+        ExcelUtil<SjZdbfKhpjbz> util = new ExcelUtil<SjZdbfKhpjbz>(SjZdbfKhpjbz.class);
+        util.exportExcel(response, list, "指导帮扶-考核评价标准数据");
+    }
+
+    /**
+     * 获取指导帮扶-考核评价标准详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:sjZdbfKhpjbz:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(sjZdbfKhpjbzService.selectSjZdbfKhpjbzById(id));
+    }
+
+    /**
+     * 新增指导帮扶-考核评价标准
+     */
+    @PreAuthorize("@ss.hasPermi('system:sjZdbfKhpjbz:add')")
+    @Log(title = "指导帮扶-考核评价标准", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SjZdbfKhpjbz sjZdbfKhpjbz)
+    {
+        return toAjax(sjZdbfKhpjbzService.insertSjZdbfKhpjbz(sjZdbfKhpjbz));
+    }
+
+    /**
+     * 修改指导帮扶-考核评价标准
+     */
+    @PreAuthorize("@ss.hasPermi('system:sjZdbfKhpjbz:edit')")
+    @Log(title = "指导帮扶-考核评价标准", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SjZdbfKhpjbz sjZdbfKhpjbz)
+    {
+        return toAjax(sjZdbfKhpjbzService.updateSjZdbfKhpjbz(sjZdbfKhpjbz));
+    }
+
+    /**
+     * 删除指导帮扶-考核评价标准
+     */
+    @PreAuthorize("@ss.hasPermi('system:sjZdbfKhpjbz:remove')")
+    @Log(title = "指导帮扶-考核评价标准", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(sjZdbfKhpjbzService.deleteSjZdbfKhpjbzByIds(ids));
+    }
+}

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

+package com.qianhe.domain;
+
+import java.util.List;
+
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.qianhe.common.annotation.Excel;
+import com.qianhe.common.core.domain.BaseEntity;
+
+/**
+ * 指导帮扶-否决项标准对象 sj_zdbf_fjxbz
+ *
+ * @author qianhe
+ * @date 2024-07-22
+ */
+@Data
+public class SjZdbfFjxbz extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 年度 */
+    @Excel(name = "年度")
+    private String nd;
+
+    /** 分类名称 */
+    @Excel(name = "分类名称")
+    private String flmc;
+
+    /** 考核项点排序 */
+    @Excel(name = "考核项点排序")
+    private Long px;
+
+    /** 预留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 String pjbz;
+
+    /** 指导帮扶-否决项标准从信息 */
+    private List<SjZdbfFjxbzCb> sjZdbfFjxbzCbList;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setNd(String nd)
+    {
+        this.nd = nd;
+    }
+
+    public String getNd()
+    {
+        return nd;
+    }
+    public void setFlmc(String flmc)
+    {
+        this.flmc = flmc;
+    }
+
+    public String getFlmc()
+    {
+        return flmc;
+    }
+    public void setPx(Long px)
+    {
+        this.px = px;
+    }
+
+    public Long getPx()
+    {
+        return px;
+    }
+    public void setYl1(String yl1)
+    {
+        this.yl1 = yl1;
+    }
+
+    public String getYl1()
+    {
+        return yl1;
+    }
+    public void setYl2(String yl2)
+    {
+        this.yl2 = yl2;
+    }
+
+    public String getYl2()
+    {
+        return yl2;
+    }
+    public void setYl3(String yl3)
+    {
+        this.yl3 = yl3;
+    }
+
+    public String getYl3()
+    {
+        return yl3;
+    }
+    public void setYl4(String yl4)
+    {
+        this.yl4 = yl4;
+    }
+
+    public String getYl4()
+    {
+        return yl4;
+    }
+    public void setYl5(String yl5)
+    {
+        this.yl5 = yl5;
+    }
+
+    public String getYl5()
+    {
+        return yl5;
+    }
+
+    public List<SjZdbfFjxbzCb> getSjZdbfFjxbzCbList()
+    {
+        return sjZdbfFjxbzCbList;
+    }
+
+    public void setSjZdbfFjxbzCbList(List<SjZdbfFjxbzCb> sjZdbfFjxbzCbList)
+    {
+        this.sjZdbfFjxbzCbList = sjZdbfFjxbzCbList;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("nd", getNd())
+            .append("flmc", getFlmc())
+            .append("px", getPx())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .append("yl1", getYl1())
+            .append("yl2", getYl2())
+            .append("yl3", getYl3())
+            .append("yl4", getYl4())
+            .append("yl5", getYl5())
+            .append("sjZdbfFjxbzCbList", getSjZdbfFjxbzCbList())
+            .toString();
+    }
+}

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

+package com.qianhe.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.qianhe.common.annotation.Excel;
+import com.qianhe.common.core.domain.BaseEntity;
+
+/**
+ * 指导帮扶-否决项标准从对象 sj_zdbf_fjxbz_cb
+ *
+ * @author qianhe
+ * @date 2024-07-22
+ */
+public class SjZdbfFjxbzCb extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 主表id */
+    @Excel(name = "主表id")
+    private Long zbId;
+
+    /** 年度 */
+    @Excel(name = "年度")
+    private String nd;
+
+    /** 分类名称 */
+    @Excel(name = "分类名称")
+    private String flmc;
+
+    /** 评价标准 */
+    @Excel(name = "评价标准")
+    private String pjbz;
+
+    /** 排序 */
+    @Excel(name = "排序")
+    private Long px;
+
+    /** 预留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;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setZbId(Long zbId)
+    {
+        this.zbId = zbId;
+    }
+
+    public Long getZbId()
+    {
+        return zbId;
+    }
+    public void setNd(String nd)
+    {
+        this.nd = nd;
+    }
+
+    public String getNd()
+    {
+        return nd;
+    }
+    public void setFlmc(String flmc)
+    {
+        this.flmc = flmc;
+    }
+
+    public String getFlmc()
+    {
+        return flmc;
+    }
+    public void setPjbz(String pjbz)
+    {
+        this.pjbz = pjbz;
+    }
+
+    public String getPjbz()
+    {
+        return pjbz;
+    }
+    public void setPx(Long px)
+    {
+        this.px = px;
+    }
+
+    public Long getPx()
+    {
+        return px;
+    }
+    public void setYl1(String yl1)
+    {
+        this.yl1 = yl1;
+    }
+
+    public String getYl1()
+    {
+        return yl1;
+    }
+    public void setYl2(String yl2)
+    {
+        this.yl2 = yl2;
+    }
+
+    public String getYl2()
+    {
+        return yl2;
+    }
+    public void setYl3(String yl3)
+    {
+        this.yl3 = yl3;
+    }
+
+    public String getYl3()
+    {
+        return yl3;
+    }
+    public void setYl4(String yl4)
+    {
+        this.yl4 = yl4;
+    }
+
+    public String getYl4()
+    {
+        return yl4;
+    }
+    public void setYl5(String yl5)
+    {
+        this.yl5 = yl5;
+    }
+
+    public String getYl5()
+    {
+        return yl5;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("zbId", getZbId())
+            .append("nd", getNd())
+            .append("flmc", getFlmc())
+            .append("pjbz", getPjbz())
+            .append("px", getPx())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .append("yl1", getYl1())
+            .append("yl2", getYl2())
+            .append("yl3", getYl3())
+            .append("yl4", getYl4())
+            .append("yl5", getYl5())
+            .toString();
+    }
+}

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

+package com.qianhe.domain;
+
+import java.util.List;
+
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.qianhe.common.annotation.Excel;
+import com.qianhe.common.core.domain.BaseEntity;
+
+/**
+ * 指导帮扶-考核评价标准对象 sj_zdbf_khpjbz
+ *
+ * @author qianhe
+ * @date 2024-07-22
+ */
+@Data
+public class SjZdbfKhpjbz extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 年度 */
+    @Excel(name = "年度")
+    private String nd;
+
+    /** 类型(采油管理区、专业化基础单位、科研基层单位、服务协调基础单位) */
+    @Excel(name = "类型(采油管理区、专业化基础单位、科研基层单位、服务协调基础单位)")
+    private String lx;
+
+    /** 考核内容 */
+    @Excel(name = "考核内容")
+    private String khnr;
+
+    /** 考核项点 */
+    @Excel(name = "考核项点")
+    private String khxd;
+
+    /** 考核内容分数 */
+    @Excel(name = "考核内容分数")
+    private String khnrfs;
+
+    /** 考核项点排序 */
+    @Excel(name = "考核项点排序")
+    private Long xppx;
+
+    /** 预留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 List<SjZdbfKhpjbzCb> sjZdbfKhpjbzCbList;
+
+
+    private String pjbz;
+
+    /** 排序 */
+    private Long px;
+
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setNd(String nd)
+    {
+        this.nd = nd;
+    }
+
+    public String getNd()
+    {
+        return nd;
+    }
+    public void setLx(String lx)
+    {
+        this.lx = lx;
+    }
+
+    public String getLx()
+    {
+        return lx;
+    }
+    public void setKhnr(String khnr)
+    {
+        this.khnr = khnr;
+    }
+
+    public String getKhnr()
+    {
+        return khnr;
+    }
+    public void setKhxd(String khxd)
+    {
+        this.khxd = khxd;
+    }
+
+    public String getKhxd()
+    {
+        return khxd;
+    }
+    public void setKhnrfs(String khnrfs)
+    {
+        this.khnrfs = khnrfs;
+    }
+
+    public String getKhnrfs()
+    {
+        return khnrfs;
+    }
+    public void setXppx(Long xppx)
+    {
+        this.xppx = xppx;
+    }
+
+    public Long getXppx()
+    {
+        return xppx;
+    }
+    public void setYl1(String yl1)
+    {
+        this.yl1 = yl1;
+    }
+
+    public String getYl1()
+    {
+        return yl1;
+    }
+    public void setYl2(String yl2)
+    {
+        this.yl2 = yl2;
+    }
+
+    public String getYl2()
+    {
+        return yl2;
+    }
+    public void setYl3(String yl3)
+    {
+        this.yl3 = yl3;
+    }
+
+    public String getYl3()
+    {
+        return yl3;
+    }
+    public void setYl4(String yl4)
+    {
+        this.yl4 = yl4;
+    }
+
+    public String getYl4()
+    {
+        return yl4;
+    }
+    public void setYl5(String yl5)
+    {
+        this.yl5 = yl5;
+    }
+
+    public String getYl5()
+    {
+        return yl5;
+    }
+
+    public List<SjZdbfKhpjbzCb> getSjZdbfKhpjbzCbList()
+    {
+        return sjZdbfKhpjbzCbList;
+    }
+
+    public void setSjZdbfKhpjbzCbList(List<SjZdbfKhpjbzCb> sjZdbfKhpjbzCbList)
+    {
+        this.sjZdbfKhpjbzCbList = sjZdbfKhpjbzCbList;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("nd", getNd())
+            .append("lx", getLx())
+            .append("khnr", getKhnr())
+            .append("khxd", getKhxd())
+            .append("khnrfs", getKhnrfs())
+            .append("xppx", getXppx())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .append("yl1", getYl1())
+            .append("yl2", getYl2())
+            .append("yl3", getYl3())
+            .append("yl4", getYl4())
+            .append("yl5", getYl5())
+            .append("sjZdbfKhpjbzCbList", getSjZdbfKhpjbzCbList())
+            .toString();
+    }
+}

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

+package com.qianhe.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.qianhe.common.annotation.Excel;
+import com.qianhe.common.core.domain.BaseEntity;
+
+/**
+ * 指导帮扶-考核评价标准从对象 sj_zdbf_khpjbz_cb
+ *
+ * @author qianhe
+ * @date 2024-07-22
+ */
+public class SjZdbfKhpjbzCb extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 主表id */
+    @Excel(name = "主表id")
+    private Long zbId;
+
+    /** 年度 */
+    @Excel(name = "年度")
+    private String nd;
+
+    /** 类型(采油管理区、专业化基础单位、科研基层单位、服务协调基础单位) */
+    @Excel(name = "类型(采油管理区、专业化基础单位、科研基层单位、服务协调基础单位)")
+    private String lx;
+
+    /** 考核内容 */
+    @Excel(name = "考核内容")
+    private String khnr;
+
+    /** 考核项点 */
+    @Excel(name = "考核项点")
+    private String khxd;
+
+    /** 评价标准 */
+    @Excel(name = "评价标准")
+    private String pjbz;
+
+    /** 排序 */
+    @Excel(name = "排序")
+    private Long px;
+
+    /** 预留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;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setZbId(Long zbId)
+    {
+        this.zbId = zbId;
+    }
+
+    public Long getZbId()
+    {
+        return zbId;
+    }
+    public void setNd(String nd)
+    {
+        this.nd = nd;
+    }
+
+    public String getNd()
+    {
+        return nd;
+    }
+    public void setLx(String lx)
+    {
+        this.lx = lx;
+    }
+
+    public String getLx()
+    {
+        return lx;
+    }
+    public void setKhnr(String khnr)
+    {
+        this.khnr = khnr;
+    }
+
+    public String getKhnr()
+    {
+        return khnr;
+    }
+    public void setKhxd(String khxd)
+    {
+        this.khxd = khxd;
+    }
+
+    public String getKhxd()
+    {
+        return khxd;
+    }
+    public void setPjbz(String pjbz)
+    {
+        this.pjbz = pjbz;
+    }
+
+    public String getPjbz()
+    {
+        return pjbz;
+    }
+    public void setPx(Long px)
+    {
+        this.px = px;
+    }
+
+    public Long getPx()
+    {
+        return px;
+    }
+    public void setYl1(String yl1)
+    {
+        this.yl1 = yl1;
+    }
+
+    public String getYl1()
+    {
+        return yl1;
+    }
+    public void setYl2(String yl2)
+    {
+        this.yl2 = yl2;
+    }
+
+    public String getYl2()
+    {
+        return yl2;
+    }
+    public void setYl3(String yl3)
+    {
+        this.yl3 = yl3;
+    }
+
+    public String getYl3()
+    {
+        return yl3;
+    }
+    public void setYl4(String yl4)
+    {
+        this.yl4 = yl4;
+    }
+
+    public String getYl4()
+    {
+        return yl4;
+    }
+    public void setYl5(String yl5)
+    {
+        this.yl5 = yl5;
+    }
+
+    public String getYl5()
+    {
+        return yl5;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("zbId", getZbId())
+            .append("nd", getNd())
+            .append("lx", getLx())
+            .append("khnr", getKhnr())
+            .append("khxd", getKhxd())
+            .append("pjbz", getPjbz())
+            .append("px", getPx())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .append("yl1", getYl1())
+            .append("yl2", getYl2())
+            .append("yl3", getYl3())
+            .append("yl4", getYl4())
+            .append("yl5", getYl5())
+            .toString();
+    }
+}

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

+package com.qianhe.mapper;
+
+import java.util.List;
+import com.qianhe.domain.SjZdbfFjxbz;
+import com.qianhe.domain.SjZdbfFjxbzCb;
+
+/**
+ * 指导帮扶-否决项标准Mapper接口
+ * 
+ * @author qianhe
+ * @date 2024-07-22
+ */
+public interface SjZdbfFjxbzMapper 
+{
+    /**
+     * 查询指导帮扶-否决项标准
+     * 
+     * @param id 指导帮扶-否决项标准主键
+     * @return 指导帮扶-否决项标准
+     */
+    public SjZdbfFjxbz selectSjZdbfFjxbzById(Long id);
+
+    /**
+     * 查询指导帮扶-否决项标准列表
+     * 
+     * @param sjZdbfFjxbz 指导帮扶-否决项标准
+     * @return 指导帮扶-否决项标准集合
+     */
+    public List<SjZdbfFjxbz> selectSjZdbfFjxbzList(SjZdbfFjxbz sjZdbfFjxbz);
+
+    /**
+     * 新增指导帮扶-否决项标准
+     * 
+     * @param sjZdbfFjxbz 指导帮扶-否决项标准
+     * @return 结果
+     */
+    public int insertSjZdbfFjxbz(SjZdbfFjxbz sjZdbfFjxbz);
+
+    /**
+     * 修改指导帮扶-否决项标准
+     * 
+     * @param sjZdbfFjxbz 指导帮扶-否决项标准
+     * @return 结果
+     */
+    public int updateSjZdbfFjxbz(SjZdbfFjxbz sjZdbfFjxbz);
+
+    /**
+     * 删除指导帮扶-否决项标准
+     * 
+     * @param id 指导帮扶-否决项标准主键
+     * @return 结果
+     */
+    public int deleteSjZdbfFjxbzById(Long id);
+
+    /**
+     * 批量删除指导帮扶-否决项标准
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSjZdbfFjxbzByIds(Long[] ids);
+
+    /**
+     * 批量删除指导帮扶-否决项标准从
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSjZdbfFjxbzCbByZbIds(Long[] ids);
+    
+    /**
+     * 批量新增指导帮扶-否决项标准从
+     * 
+     * @param sjZdbfFjxbzCbList 指导帮扶-否决项标准从列表
+     * @return 结果
+     */
+    public int batchSjZdbfFjxbzCb(List<SjZdbfFjxbzCb> sjZdbfFjxbzCbList);
+    
+
+    /**
+     * 通过指导帮扶-否决项标准主键删除指导帮扶-否决项标准从信息
+     * 
+     * @param id 指导帮扶-否决项标准ID
+     * @return 结果
+     */
+    public int deleteSjZdbfFjxbzCbByZbId(Long id);
+
+    List<SjZdbfFjxbz> selectSjZdbfFjxbzCxList(SjZdbfFjxbz sjZdbfFjxbz);
+
+    List<SjZdbfFjxbzCb> selectSjZdbfFjxbzCbById(Long id);
+
+
+}

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

+package com.qianhe.mapper;
+
+import java.util.List;
+import com.qianhe.domain.SjZdbfKhpjbz;
+import com.qianhe.domain.SjZdbfKhpjbzCb;
+
+/**
+ * 指导帮扶-考核评价标准Mapper接口
+ * 
+ * @author qianhe
+ * @date 2024-07-22
+ */
+public interface SjZdbfKhpjbzMapper 
+{
+    /**
+     * 查询指导帮扶-考核评价标准
+     * 
+     * @param id 指导帮扶-考核评价标准主键
+     * @return 指导帮扶-考核评价标准
+     */
+    public SjZdbfKhpjbz selectSjZdbfKhpjbzById(Long id);
+
+    /**
+     * 查询指导帮扶-考核评价标准列表
+     * 
+     * @param sjZdbfKhpjbz 指导帮扶-考核评价标准
+     * @return 指导帮扶-考核评价标准集合
+     */
+    public List<SjZdbfKhpjbz> selectSjZdbfKhpjbzList(SjZdbfKhpjbz sjZdbfKhpjbz);
+
+    /**
+     * 新增指导帮扶-考核评价标准
+     * 
+     * @param sjZdbfKhpjbz 指导帮扶-考核评价标准
+     * @return 结果
+     */
+    public int insertSjZdbfKhpjbz(SjZdbfKhpjbz sjZdbfKhpjbz);
+
+    /**
+     * 修改指导帮扶-考核评价标准
+     * 
+     * @param sjZdbfKhpjbz 指导帮扶-考核评价标准
+     * @return 结果
+     */
+    public int updateSjZdbfKhpjbz(SjZdbfKhpjbz sjZdbfKhpjbz);
+
+    /**
+     * 删除指导帮扶-考核评价标准
+     * 
+     * @param id 指导帮扶-考核评价标准主键
+     * @return 结果
+     */
+    public int deleteSjZdbfKhpjbzById(Long id);
+
+    /**
+     * 批量删除指导帮扶-考核评价标准
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSjZdbfKhpjbzByIds(Long[] ids);
+
+    /**
+     * 批量删除指导帮扶-考核评价标准从
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSjZdbfKhpjbzCbByZbIds(Long[] ids);
+    
+    /**
+     * 批量新增指导帮扶-考核评价标准从
+     * 
+     * @param sjZdbfKhpjbzCbList 指导帮扶-考核评价标准从列表
+     * @return 结果
+     */
+    public int batchSjZdbfKhpjbzCb(List<SjZdbfKhpjbzCb> sjZdbfKhpjbzCbList);
+    
+
+    /**
+     * 通过指导帮扶-考核评价标准主键删除指导帮扶-考核评价标准从信息
+     * 
+     * @param id 指导帮扶-考核评价标准ID
+     * @return 结果
+     */
+    public int deleteSjZdbfKhpjbzCbByZbId(Long id);
+
+    List<SjZdbfKhpjbzCb> selectSjZdbfKhpjbzCbById(Long id);
+
+
+    List<SjZdbfKhpjbz> selectSjZdbfKhpjbzCxList(SjZdbfKhpjbz sjZdbfKhpjbz);
+
+
+}

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

+package com.qianhe.service;
+
+import java.util.List;
+import com.qianhe.domain.SjZdbfFjxbz;
+
+/**
+ * 指导帮扶-否决项标准Service接口
+ * 
+ * @author qianhe
+ * @date 2024-07-22
+ */
+public interface ISjZdbfFjxbzService 
+{
+    /**
+     * 查询指导帮扶-否决项标准
+     * 
+     * @param id 指导帮扶-否决项标准主键
+     * @return 指导帮扶-否决项标准
+     */
+    public SjZdbfFjxbz selectSjZdbfFjxbzById(Long id);
+
+    /**
+     * 查询指导帮扶-否决项标准列表
+     * 
+     * @param sjZdbfFjxbz 指导帮扶-否决项标准
+     * @return 指导帮扶-否决项标准集合
+     */
+    public List<SjZdbfFjxbz> selectSjZdbfFjxbzList(SjZdbfFjxbz sjZdbfFjxbz);
+
+    /**
+     * 新增指导帮扶-否决项标准
+     * 
+     * @param sjZdbfFjxbz 指导帮扶-否决项标准
+     * @return 结果
+     */
+    public int insertSjZdbfFjxbz(SjZdbfFjxbz sjZdbfFjxbz);
+
+    /**
+     * 修改指导帮扶-否决项标准
+     * 
+     * @param sjZdbfFjxbz 指导帮扶-否决项标准
+     * @return 结果
+     */
+    public int updateSjZdbfFjxbz(SjZdbfFjxbz sjZdbfFjxbz);
+
+    /**
+     * 批量删除指导帮扶-否决项标准
+     * 
+     * @param ids 需要删除的指导帮扶-否决项标准主键集合
+     * @return 结果
+     */
+    public int deleteSjZdbfFjxbzByIds(Long[] ids);
+
+    /**
+     * 删除指导帮扶-否决项标准信息
+     * 
+     * @param id 指导帮扶-否决项标准主键
+     * @return 结果
+     */
+    public int deleteSjZdbfFjxbzById(Long id);
+
+    List<SjZdbfFjxbz> selectSjZdbfFjxbzCxList(SjZdbfFjxbz sjZdbfFjxbz);
+
+}

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

+package com.qianhe.service;
+
+import java.util.List;
+import com.qianhe.domain.SjZdbfKhpjbz;
+
+/**
+ * 指导帮扶-考核评价标准Service接口
+ * 
+ * @author qianhe
+ * @date 2024-07-22
+ */
+public interface ISjZdbfKhpjbzService 
+{
+    /**
+     * 查询指导帮扶-考核评价标准
+     * 
+     * @param id 指导帮扶-考核评价标准主键
+     * @return 指导帮扶-考核评价标准
+     */
+    public SjZdbfKhpjbz selectSjZdbfKhpjbzById(Long id);
+
+    /**
+     * 查询指导帮扶-考核评价标准列表
+     * 
+     * @param sjZdbfKhpjbz 指导帮扶-考核评价标准
+     * @return 指导帮扶-考核评价标准集合
+     */
+    public List<SjZdbfKhpjbz> selectSjZdbfKhpjbzList(SjZdbfKhpjbz sjZdbfKhpjbz);
+
+    /**
+     * 新增指导帮扶-考核评价标准
+     * 
+     * @param sjZdbfKhpjbz 指导帮扶-考核评价标准
+     * @return 结果
+     */
+    public int insertSjZdbfKhpjbz(SjZdbfKhpjbz sjZdbfKhpjbz);
+
+    /**
+     * 修改指导帮扶-考核评价标准
+     * 
+     * @param sjZdbfKhpjbz 指导帮扶-考核评价标准
+     * @return 结果
+     */
+    public int updateSjZdbfKhpjbz(SjZdbfKhpjbz sjZdbfKhpjbz);
+
+    /**
+     * 批量删除指导帮扶-考核评价标准
+     * 
+     * @param ids 需要删除的指导帮扶-考核评价标准主键集合
+     * @return 结果
+     */
+    public int deleteSjZdbfKhpjbzByIds(Long[] ids);
+
+    /**
+     * 删除指导帮扶-考核评价标准信息
+     * 
+     * @param id 指导帮扶-考核评价标准主键
+     * @return 结果
+     */
+    public int deleteSjZdbfKhpjbzById(Long id);
+
+    List<SjZdbfKhpjbz> selectSjZdbfKhpjbzCxList(SjZdbfKhpjbz sjZdbfKhpjbz);
+
+
+}

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

+package com.qianhe.service.impl;
+
+import java.util.List;
+import com.qianhe.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.ArrayList;
+import com.qianhe.common.utils.StringUtils;
+import org.springframework.transaction.annotation.Transactional;
+import com.qianhe.domain.SjZdbfFjxbzCb;
+import com.qianhe.mapper.SjZdbfFjxbzMapper;
+import com.qianhe.domain.SjZdbfFjxbz;
+import com.qianhe.service.ISjZdbfFjxbzService;
+
+/**
+ * 指导帮扶-否决项标准Service业务层处理
+ *
+ * @author qianhe
+ * @date 2024-07-22
+ */
+@Service
+public class SjZdbfFjxbzServiceImpl implements ISjZdbfFjxbzService
+{
+    @Autowired
+    private SjZdbfFjxbzMapper sjZdbfFjxbzMapper;
+
+    /**
+     * 查询指导帮扶-否决项标准
+     *
+     * @param id 指导帮扶-否决项标准主键
+     * @return 指导帮扶-否决项标准
+     */
+    @Override
+    public SjZdbfFjxbz selectSjZdbfFjxbzById(Long id)
+    {
+        SjZdbfFjxbz sjZdbfFjxbz = sjZdbfFjxbzMapper.selectSjZdbfFjxbzById(id);
+        List<SjZdbfFjxbzCb> cbList=sjZdbfFjxbzMapper.selectSjZdbfFjxbzCbById(id);
+        sjZdbfFjxbz.setSjZdbfFjxbzCbList(cbList);
+        return sjZdbfFjxbz;
+    }
+
+    /**
+     * 查询指导帮扶-否决项标准列表
+     *
+     * @param sjZdbfFjxbz 指导帮扶-否决项标准
+     * @return 指导帮扶-否决项标准
+     */
+    @Override
+    public List<SjZdbfFjxbz> selectSjZdbfFjxbzList(SjZdbfFjxbz sjZdbfFjxbz)
+    {
+        return sjZdbfFjxbzMapper.selectSjZdbfFjxbzList(sjZdbfFjxbz);
+    }
+
+    /**
+     * 新增指导帮扶-否决项标准
+     *
+     * @param sjZdbfFjxbz 指导帮扶-否决项标准
+     * @return 结果
+     */
+    @Transactional
+    @Override
+    public int insertSjZdbfFjxbz(SjZdbfFjxbz sjZdbfFjxbz)
+    {
+        sjZdbfFjxbz.setCreateTime(DateUtils.getNowDate());
+        int rows = sjZdbfFjxbzMapper.insertSjZdbfFjxbz(sjZdbfFjxbz);
+        insertSjZdbfFjxbzCb(sjZdbfFjxbz);
+        return rows;
+    }
+
+    /**
+     * 修改指导帮扶-否决项标准
+     *
+     * @param sjZdbfFjxbz 指导帮扶-否决项标准
+     * @return 结果
+     */
+    @Transactional
+    @Override
+    public int updateSjZdbfFjxbz(SjZdbfFjxbz sjZdbfFjxbz)
+    {
+        sjZdbfFjxbz.setUpdateTime(DateUtils.getNowDate());
+        sjZdbfFjxbzMapper.deleteSjZdbfFjxbzCbByZbId(sjZdbfFjxbz.getId());
+        insertSjZdbfFjxbzCb(sjZdbfFjxbz);
+        return sjZdbfFjxbzMapper.updateSjZdbfFjxbz(sjZdbfFjxbz);
+    }
+
+    /**
+     * 批量删除指导帮扶-否决项标准
+     *
+     * @param ids 需要删除的指导帮扶-否决项标准主键
+     * @return 结果
+     */
+    @Transactional
+    @Override
+    public int deleteSjZdbfFjxbzByIds(Long[] ids)
+    {
+        sjZdbfFjxbzMapper.deleteSjZdbfFjxbzCbByZbIds(ids);
+        return sjZdbfFjxbzMapper.deleteSjZdbfFjxbzByIds(ids);
+    }
+
+    /**
+     * 删除指导帮扶-否决项标准信息
+     *
+     * @param id 指导帮扶-否决项标准主键
+     * @return 结果
+     */
+    @Transactional
+    @Override
+    public int deleteSjZdbfFjxbzById(Long id)
+    {
+        sjZdbfFjxbzMapper.deleteSjZdbfFjxbzCbByZbId(id);
+        return sjZdbfFjxbzMapper.deleteSjZdbfFjxbzById(id);
+    }
+
+    @Override
+    public List<SjZdbfFjxbz> selectSjZdbfFjxbzCxList(SjZdbfFjxbz sjZdbfFjxbz) {
+        return sjZdbfFjxbzMapper.selectSjZdbfFjxbzCxList(sjZdbfFjxbz);
+    }
+
+    /**
+     * 新增指导帮扶-否决项标准从信息
+     *
+     * @param sjZdbfFjxbz 指导帮扶-否决项标准对象
+     */
+    public void insertSjZdbfFjxbzCb(SjZdbfFjxbz sjZdbfFjxbz)
+    {
+        List<SjZdbfFjxbzCb> sjZdbfFjxbzCbList = sjZdbfFjxbz.getSjZdbfFjxbzCbList();
+        Long id = sjZdbfFjxbz.getId();
+        if (StringUtils.isNotNull(sjZdbfFjxbzCbList))
+        {
+            List<SjZdbfFjxbzCb> list = new ArrayList<SjZdbfFjxbzCb>();
+            for (SjZdbfFjxbzCb sjZdbfFjxbzCb : sjZdbfFjxbzCbList)
+            {
+                sjZdbfFjxbzCb.setFlmc(sjZdbfFjxbz.getFlmc());
+                sjZdbfFjxbzCb.setNd(sjZdbfFjxbz.getNd());
+                sjZdbfFjxbzCb.setZbId(id);
+                list.add(sjZdbfFjxbzCb);
+            }
+            if (list.size() > 0)
+            {
+                sjZdbfFjxbzMapper.batchSjZdbfFjxbzCb(list);
+            }
+        }
+    }
+}

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

+package com.qianhe.service.impl;
+
+import java.util.List;
+import com.qianhe.common.utils.DateUtils;
+import com.qianhe.common.utils.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.ArrayList;
+import com.qianhe.common.utils.StringUtils;
+import org.springframework.transaction.annotation.Transactional;
+import com.qianhe.domain.SjZdbfKhpjbzCb;
+import com.qianhe.mapper.SjZdbfKhpjbzMapper;
+import com.qianhe.domain.SjZdbfKhpjbz;
+import com.qianhe.service.ISjZdbfKhpjbzService;
+
+/**
+ * 指导帮扶-考核评价标准Service业务层处理
+ *
+ * @author qianhe
+ * @date 2024-07-22
+ */
+@Service
+public class SjZdbfKhpjbzServiceImpl implements ISjZdbfKhpjbzService
+{
+    @Autowired
+    private SjZdbfKhpjbzMapper sjZdbfKhpjbzMapper;
+
+    /**
+     * 查询指导帮扶-考核评价标准
+     *
+     * @param id 指导帮扶-考核评价标准主键
+     * @return 指导帮扶-考核评价标准
+     */
+    @Override
+    public SjZdbfKhpjbz selectSjZdbfKhpjbzById(Long id)
+    {
+        SjZdbfKhpjbz sjZdbfKhpjbz = sjZdbfKhpjbzMapper.selectSjZdbfKhpjbzById(id);
+        List<SjZdbfKhpjbzCb> cbs=sjZdbfKhpjbzMapper.selectSjZdbfKhpjbzCbById(id);
+        sjZdbfKhpjbz.setSjZdbfKhpjbzCbList(cbs);
+        return sjZdbfKhpjbz;
+    }
+
+    /**
+     * 查询指导帮扶-考核评价标准列表
+     *
+     * @param sjZdbfKhpjbz 指导帮扶-考核评价标准
+     * @return 指导帮扶-考核评价标准
+     */
+    @Override
+    public List<SjZdbfKhpjbz> selectSjZdbfKhpjbzList(SjZdbfKhpjbz sjZdbfKhpjbz)
+    {
+        return sjZdbfKhpjbzMapper.selectSjZdbfKhpjbzList(sjZdbfKhpjbz);
+    }
+
+    /**
+     * 新增指导帮扶-考核评价标准
+     *
+     * @param sjZdbfKhpjbz 指导帮扶-考核评价标准
+     * @return 结果
+     */
+    @Transactional
+    @Override
+    public int insertSjZdbfKhpjbz(SjZdbfKhpjbz sjZdbfKhpjbz)
+    {
+        sjZdbfKhpjbz.setCreateTime(DateUtils.getNowDate());
+        sjZdbfKhpjbz.setCreateBy(SecurityUtils.getUsername());
+        int rows = sjZdbfKhpjbzMapper.insertSjZdbfKhpjbz(sjZdbfKhpjbz);
+        insertSjZdbfKhpjbzCb(sjZdbfKhpjbz);
+        return rows;
+    }
+
+    /**
+     * 修改指导帮扶-考核评价标准
+     *
+     * @param sjZdbfKhpjbz 指导帮扶-考核评价标准
+     * @return 结果
+     */
+    @Transactional
+    @Override
+    public int updateSjZdbfKhpjbz(SjZdbfKhpjbz sjZdbfKhpjbz)
+    {
+        sjZdbfKhpjbz.setUpdateTime(DateUtils.getNowDate());
+        sjZdbfKhpjbz.setUpdateBy(SecurityUtils.getUsername());
+        sjZdbfKhpjbzMapper.deleteSjZdbfKhpjbzCbByZbId(sjZdbfKhpjbz.getId());
+        insertSjZdbfKhpjbzCb(sjZdbfKhpjbz);
+        return sjZdbfKhpjbzMapper.updateSjZdbfKhpjbz(sjZdbfKhpjbz);
+    }
+
+    /**
+     * 批量删除指导帮扶-考核评价标准
+     *
+     * @param ids 需要删除的指导帮扶-考核评价标准主键
+     * @return 结果
+     */
+    @Transactional
+    @Override
+    public int deleteSjZdbfKhpjbzByIds(Long[] ids)
+    {
+        sjZdbfKhpjbzMapper.deleteSjZdbfKhpjbzCbByZbIds(ids);
+        return sjZdbfKhpjbzMapper.deleteSjZdbfKhpjbzByIds(ids);
+    }
+
+    /**
+     * 删除指导帮扶-考核评价标准信息
+     *
+     * @param id 指导帮扶-考核评价标准主键
+     * @return 结果
+     */
+    @Transactional
+    @Override
+    public int deleteSjZdbfKhpjbzById(Long id)
+    {
+        sjZdbfKhpjbzMapper.deleteSjZdbfKhpjbzCbByZbId(id);
+        return sjZdbfKhpjbzMapper.deleteSjZdbfKhpjbzById(id);
+    }
+
+    @Override
+    public List<SjZdbfKhpjbz> selectSjZdbfKhpjbzCxList(SjZdbfKhpjbz sjZdbfKhpjbz) {
+        return sjZdbfKhpjbzMapper.selectSjZdbfKhpjbzCxList(sjZdbfKhpjbz);
+    }
+
+    /**
+     * 新增指导帮扶-考核评价标准从信息
+     *
+     * @param sjZdbfKhpjbz 指导帮扶-考核评价标准对象
+     */
+    public void insertSjZdbfKhpjbzCb(SjZdbfKhpjbz sjZdbfKhpjbz)
+    {
+        List<SjZdbfKhpjbzCb> sjZdbfKhpjbzCbList = sjZdbfKhpjbz.getSjZdbfKhpjbzCbList();
+        Long id = sjZdbfKhpjbz.getId();
+        if (StringUtils.isNotNull(sjZdbfKhpjbzCbList))
+        {
+            List<SjZdbfKhpjbzCb> list = new ArrayList<SjZdbfKhpjbzCb>();
+            for (SjZdbfKhpjbzCb sjZdbfKhpjbzCb : sjZdbfKhpjbzCbList)
+            {
+                sjZdbfKhpjbzCb.setCreateBy(SecurityUtils.getUsername());
+                sjZdbfKhpjbzCb.setCreateTime(DateUtils.getNowDate());
+                sjZdbfKhpjbzCb.setKhnr(sjZdbfKhpjbz.getKhnr());
+                sjZdbfKhpjbzCb.setKhxd(sjZdbfKhpjbz.getKhxd());
+                sjZdbfKhpjbzCb.setLx(sjZdbfKhpjbz.getLx());
+                sjZdbfKhpjbzCb.setNd(sjZdbfKhpjbz.getNd());
+                sjZdbfKhpjbzCb.setZbId(id);
+                list.add(sjZdbfKhpjbzCb);
+            }
+            if (list.size() > 0)
+            {
+                sjZdbfKhpjbzMapper.batchSjZdbfKhpjbzCb(list);
+            }
+        }
+    }
+}

qianhe-ydsj/src/main/resources/mapper/SjZdbfFjxbzMapper.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.SjZdbfFjxbzMapper">
+    
+    <resultMap type="SjZdbfFjxbz" id="SjZdbfFjxbzResult">
+        <result property="id"    column="id"    />
+        <result property="nd"    column="nd"    />
+        <result property="flmc"    column="flmc"    />
+        <result property="px"    column="px"    />
+        <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"    />
+    </resultMap>
+
+    <resultMap id="SjZdbfFjxbzSjZdbfFjxbzCbResult" type="SjZdbfFjxbz" extends="SjZdbfFjxbzResult">
+        <collection property="sjZdbfFjxbzCbList" notNullColumn="id" javaType="java.util.List" resultMap="SjZdbfFjxbzCbResult" />
+    </resultMap>
+
+    <resultMap type="SjZdbfFjxbzCb" id="SjZdbfFjxbzCbResult">
+        <result property="id"    column="id"    />
+        <result property="zbId"    column="zb_id"    />
+        <result property="nd"    column="nd"    />
+        <result property="flmc"    column="flmc"    />
+        <result property="pjbz"    column="pjbz"    />
+        <result property="px"    column="px"    />
+        <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"    />
+    </resultMap>
+
+    <sql id="selectSjZdbfFjxbzVo">
+        select id, nd, flmc, px, create_by, create_time, update_by, update_time, remark, yl1, yl2, yl3, yl4, yl5 from sj_zdbf_fjxbz
+    </sql>
+
+    <select id="selectSjZdbfFjxbzList" parameterType="SjZdbfFjxbz" resultMap="SjZdbfFjxbzResult">
+        <include refid="selectSjZdbfFjxbzVo"/>
+        <where>  
+            <if test="nd != null  and nd != ''"> and nd = #{nd}</if>
+            <if test="flmc != null  and flmc != ''"> and flmc = #{flmc}</if>
+            <if test="px != null "> and px = #{px}</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>
+        </where>
+    </select>
+    
+    <select id="selectSjZdbfFjxbzById" parameterType="Long" resultMap="SjZdbfFjxbzResult">
+        select a.id, a.nd, a.flmc, a.px, a.create_by, a.create_time, a.update_by, a.update_time, a.remark, a.yl1, a.yl2, a.yl3, a.yl4, a.yl5
+        from sj_zdbf_fjxbz a
+
+        where a.id = #{id}
+    </select>
+    <select id="selectSjZdbfFjxbzCxList" resultType="com.qianhe.domain.SjZdbfFjxbz">
+        select a.nd,a.flmc,a.px,b.pjbz,b.px
+        from sj_zdbf_fjxbz a
+                 left join sj_zdbf_fjxbz_cb b on a.id = b.zb_id
+        where 1=1
+        <if test="nd != null  and nd != ''"> and a.nd = #{nd}</if>
+        <if test="flmc != null  and flmc != ''"> and a.flmc = #{flmc}</if>
+        order by a.px,b.px
+
+    </select>
+    <select id="selectSjZdbfFjxbzCbById" resultType="com.qianhe.domain.SjZdbfFjxbzCb">
+        select *from sj_zdbf_fjxbz_cb where zb_id=#{id}
+    </select>
+
+    <insert id="insertSjZdbfFjxbz" parameterType="SjZdbfFjxbz" useGeneratedKeys="true" keyProperty="id">
+        insert into sj_zdbf_fjxbz
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="nd != null">nd,</if>
+            <if test="flmc != null">flmc,</if>
+            <if test="px != null">px,</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="nd != null">#{nd},</if>
+            <if test="flmc != null">#{flmc},</if>
+            <if test="px != null">#{px},</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>
+
+    <update id="updateSjZdbfFjxbz" parameterType="SjZdbfFjxbz">
+        update sj_zdbf_fjxbz
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="nd != null">nd = #{nd},</if>
+            <if test="flmc != null">flmc = #{flmc},</if>
+            <if test="px != null">px = #{px},</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="deleteSjZdbfFjxbzById" parameterType="Long">
+        delete from sj_zdbf_fjxbz where id = #{id}
+    </delete>
+
+    <delete id="deleteSjZdbfFjxbzByIds" parameterType="String">
+        delete from sj_zdbf_fjxbz where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+    
+    <delete id="deleteSjZdbfFjxbzCbByZbIds" parameterType="String">
+        delete from sj_zdbf_fjxbz_cb where zb_id in 
+        <foreach item="zbId" collection="array" open="(" separator="," close=")">
+            #{zbId}
+        </foreach>
+    </delete>
+
+    <delete id="deleteSjZdbfFjxbzCbByZbId" parameterType="Long">
+        delete from sj_zdbf_fjxbz_cb where zb_id = #{zbId}
+    </delete>
+
+    <insert id="batchSjZdbfFjxbzCb">
+        insert into sj_zdbf_fjxbz_cb( id, zb_id, nd, flmc, pjbz, px,   remark, yl1, yl2, yl3, yl4, yl5) values
+		<foreach item="item" index="index" collection="list" separator=",">
+            ( #{item.id}, #{item.zbId}, #{item.nd}, #{item.flmc}, #{item.pjbz}, #{item.px},   #{item.remark}, #{item.yl1}, #{item.yl2}, #{item.yl3}, #{item.yl4}, #{item.yl5})
+        </foreach>
+    </insert>
+</mapper>
\ No newline at end of file

qianhe-ydsj/src/main/resources/mapper/SjZdbfKhpjbzMapper.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.SjZdbfKhpjbzMapper">
+    
+    <resultMap type="SjZdbfKhpjbz" id="SjZdbfKhpjbzResult">
+        <result property="id"    column="id"    />
+        <result property="nd"    column="nd"    />
+        <result property="lx"    column="lx"    />
+        <result property="khnr"    column="khnr"    />
+        <result property="khxd"    column="khxd"    />
+        <result property="khnrfs"    column="khnrfs"    />
+        <result property="xppx"    column="xppx"    />
+        <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"    />
+    </resultMap>
+
+    <resultMap id="SjZdbfKhpjbzSjZdbfKhpjbzCbResult" type="SjZdbfKhpjbz" extends="SjZdbfKhpjbzResult">
+        <collection property="sjZdbfKhpjbzCbList" notNullColumn="sub_id" javaType="java.util.List" resultMap="SjZdbfKhpjbzCbResult" />
+    </resultMap>
+
+    <resultMap type="SjZdbfKhpjbzCb" id="SjZdbfKhpjbzCbResult">
+        <result property="id"    column="id"    />
+        <result property="zbId"    column="zb_id"    />
+        <result property="nd"    column="nd"    />
+        <result property="lx"    column="lx"    />
+        <result property="khnr"    column="khnr"    />
+        <result property="khxd"    column="khxd"    />
+        <result property="pjbz"    column="pjbz"    />
+        <result property="px"    column="px"    />
+        <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"    />
+    </resultMap>
+
+    <sql id="selectSjZdbfKhpjbzVo">
+        select id, nd, lx, khnr, khxd, khnrfs, xppx, create_by, create_time, update_by, update_time, remark, yl1, yl2, yl3, yl4, yl5 from sj_zdbf_khpjbz
+    </sql>
+
+    <select id="selectSjZdbfKhpjbzList" parameterType="SjZdbfKhpjbz" resultMap="SjZdbfKhpjbzResult">
+        <include refid="selectSjZdbfKhpjbzVo"/>
+        <where>  
+            <if test="nd != null  and nd != ''"> and nd = #{nd}</if>
+            <if test="lx != null  and lx != ''"> and lx = #{lx}</if>
+            <if test="khnr != null  and khnr != ''"> and khnr = #{khnr}</if>
+            <if test="khxd != null  and khxd != ''"> and khxd = #{khxd}</if>
+            <if test="khnrfs != null  and khnrfs != ''"> and khnrfs = #{khnrfs}</if>
+            <if test="xppx != null "> and xppx = #{xppx}</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>
+        </where>
+    </select>
+    
+    <select id="selectSjZdbfKhpjbzById" parameterType="Long" resultMap="SjZdbfKhpjbzResult">
+        select a.id, a.nd, a.lx, a.khnr, a.khxd, a.khnrfs, a.xppx, a.create_by, a.create_time, a.update_by, a.update_time, a.remark, a.yl1, a.yl2, a.yl3, a.yl4, a.yl5
+        from sj_zdbf_khpjbz a
+        where a.id = #{id}
+    </select>
+    <select id="selectSjZdbfKhpjbzCbById" resultMap="SjZdbfKhpjbzCbResult">
+        select   * from  sj_zdbf_khpjbz_cb where zb_id=#{id}
+    </select>
+    <select id="selectSjZdbfKhpjbzCxList" resultType="com.qianhe.domain.SjZdbfKhpjbz">
+        select a.id, a.nd,a.lx,a.khnr,a.khxd,a.khnr,a.xppx,b.pjbz,b.px
+        from sj_zdbf_khpjbz a
+                 left join sj_zdbf_khpjbz_cb b on a.id = b.zb_id
+        where 1=1
+        <if test="nd != null  and nd != ''"> and a.nd = #{nd}</if>
+        <if test="lx != null  and lx != ''"> and a.lx = #{lx}</if>
+    </select>
+
+    <insert id="insertSjZdbfKhpjbz" parameterType="SjZdbfKhpjbz" useGeneratedKeys="true" keyProperty="id">
+        insert into sj_zdbf_khpjbz
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="nd != null">nd,</if>
+            <if test="lx != null">lx,</if>
+            <if test="khnr != null">khnr,</if>
+            <if test="khxd != null">khxd,</if>
+            <if test="khnrfs != null">khnrfs,</if>
+            <if test="xppx != null">xppx,</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="nd != null">#{nd},</if>
+            <if test="lx != null">#{lx},</if>
+            <if test="khnr != null">#{khnr},</if>
+            <if test="khxd != null">#{khxd},</if>
+            <if test="khnrfs != null">#{khnrfs},</if>
+            <if test="xppx != null">#{xppx},</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>
+
+    <update id="updateSjZdbfKhpjbz" parameterType="SjZdbfKhpjbz">
+        update sj_zdbf_khpjbz
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="nd != null">nd = #{nd},</if>
+            <if test="lx != null">lx = #{lx},</if>
+            <if test="khnr != null">khnr = #{khnr},</if>
+            <if test="khxd != null">khxd = #{khxd},</if>
+            <if test="khnrfs != null">khnrfs = #{khnrfs},</if>
+            <if test="xppx != null">xppx = #{xppx},</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="deleteSjZdbfKhpjbzById" parameterType="Long">
+        delete from sj_zdbf_khpjbz where id = #{id}
+    </delete>
+
+    <delete id="deleteSjZdbfKhpjbzByIds" parameterType="String">
+        delete from sj_zdbf_khpjbz where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+    
+    <delete id="deleteSjZdbfKhpjbzCbByZbIds" parameterType="String">
+        delete from sj_zdbf_khpjbz_cb where zb_id in 
+        <foreach item="zbId" collection="array" open="(" separator="," close=")">
+            #{zbId}
+        </foreach>
+    </delete>
+
+    <delete id="deleteSjZdbfKhpjbzCbByZbId" parameterType="Long">
+        delete from sj_zdbf_khpjbz_cb where zb_id = #{zbId}
+    </delete>
+
+    <insert id="batchSjZdbfKhpjbzCb">
+        insert into sj_zdbf_khpjbz_cb( id, zb_id, nd, lx, khnr, khxd, pjbz, px, create_by, create_time, update_by, update_time, remark, yl1, yl2, yl3, yl4, yl5) values
+		<foreach item="item" index="index" collection="list" separator=",">
+            ( #{item.id}, #{item.zbId}, #{item.nd}, #{item.lx}, #{item.khnr}, #{item.khxd}, #{item.pjbz}, #{item.px}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}, #{item.remark}, #{item.yl1}, #{item.yl2}, #{item.yl3}, #{item.yl4}, #{item.yl5})
+        </foreach>
+    </insert>
+</mapper>
\ No newline at end of file