练兵帮扶组

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

@@ -278,6 +278,7 @@ public class SjGfjsBfzkhpjController extends BaseController
     @PostMapping("/export")
     public void export(HttpServletResponse response, SjGfjsZsdwkhpj sjGfjsZsdwkhpj)
     {
+        sjGfjsZsdwkhpj.setJb("帮扶组");
         List<SjGfjsZsdwkhpj> list = sjGfjsZsdwkhpjService.selectSjGfjsZsdwkhpjList(sjGfjsZsdwkhpj);
 
         Workbook exl = null;

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

@@ -290,6 +290,7 @@ public class SjGfjsJcdwkhpjController extends BaseController
     @PostMapping("/export")
     public void export(HttpServletResponse response, SjGfjsZsdwkhpj sjGfjsZsdwkhpj)
     {
+        sjGfjsZsdwkhpj.setJb("基层单位");
         List<SjGfjsZsdwkhpj> list = sjGfjsZsdwkhpjService.selectSjGfjsZsdwkhpjList(sjGfjsZsdwkhpj);
 
         Workbook exl = null;

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

+package com.qianhe.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.qianhe.common.core.domain.entity.SysRole;
+import com.qianhe.common.utils.SecurityUtils;
+import com.qianhe.common.utils.StringUtils;
+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.SjGfjsLbzdbf;
+import com.qianhe.service.ISjGfjsLbzdbfService;
+import com.qianhe.common.utils.poi.ExcelUtil;
+import com.qianhe.common.core.page.TableDataInfo;
+
+/**
+ * 规范建设-练兵指导帮扶Controller
+ *
+ * @author qianhe
+ * @date 2025-08-19
+ */
+@RestController
+@RequestMapping("/system/SjGfjsLbzdbf")
+public class SjGfjsLbzdbfController extends BaseController
+{
+    @Autowired
+    private ISjGfjsLbzdbfService sjGfjsLbzdbfService;
+
+    /**
+     * 查询规范建设-练兵指导帮扶列表
+     */
+
+    @GetMapping("/list")
+    public TableDataInfo list(SjGfjsLbzdbf sjGfjsLbzdbf)
+    {
+        sjGfjsLbzdbf.setLxr(SecurityUtils.getUserId());
+        // 拿到角色如果是管理员 不限制。不是管理员只能看到自己的帮扶组
+        List<SysRole> rolelist = SecurityUtils.getLoginUser().getUser().getRoles();
+        if(StringUtils.isNotEmpty(rolelist)){
+            for (SysRole role :rolelist){
+                Long roleid = role.getRoleId();
+                if(roleid==1||roleid==100){
+                    sjGfjsLbzdbf.setLxr(null);
+                }
+            }
+        }
+        startPage();
+        List<SjGfjsLbzdbf> list = sjGfjsLbzdbfService.selectSjGfjsLbzdbfList(sjGfjsLbzdbf);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出规范建设-练兵指导帮扶列表
+     */
+
+    @Log(title = "规范建设-练兵指导帮扶", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SjGfjsLbzdbf sjGfjsLbzdbf)
+    {
+        List<SjGfjsLbzdbf> list = sjGfjsLbzdbfService.selectSjGfjsLbzdbfList(sjGfjsLbzdbf);
+        ExcelUtil<SjGfjsLbzdbf> util = new ExcelUtil<SjGfjsLbzdbf>(SjGfjsLbzdbf.class);
+        util.exportExcel(response, list, "规范建设-练兵指导帮扶数据");
+    }
+
+    /**
+     * 获取规范建设-练兵指导帮扶详细信息
+     */
+
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(sjGfjsLbzdbfService.selectSjGfjsLbzdbfById(id));
+    }
+
+    /**
+     * 新增规范建设-练兵指导帮扶
+     */
+
+    @Log(title = "规范建设-练兵指导帮扶", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SjGfjsLbzdbf sjGfjsLbzdbf)
+    {
+        return toAjax(sjGfjsLbzdbfService.insertSjGfjsLbzdbf(sjGfjsLbzdbf));
+    }
+
+    /**
+     * 修改规范建设-练兵指导帮扶
+     */
+
+    @Log(title = "规范建设-练兵指导帮扶", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SjGfjsLbzdbf sjGfjsLbzdbf)
+    {
+        return toAjax(sjGfjsLbzdbfService.updateSjGfjsLbzdbf(sjGfjsLbzdbf));
+    }
+
+    /**
+     * 删除规范建设-练兵指导帮扶
+     */
+
+    @Log(title = "规范建设-练兵指导帮扶", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(sjGfjsLbzdbfService.deleteSjGfjsLbzdbfByIds(ids));
+    }
+}

qianhe-ydsj/src/main/java/com/qianhe/controller/SjGfjsLbzdbfJgController.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.SjGfjsLbzdbfJg;
+import com.qianhe.service.ISjGfjsLbzdbfJgService;
+import com.qianhe.common.utils.poi.ExcelUtil;
+import com.qianhe.common.core.page.TableDataInfo;
+
+/**
+ * 规范建设-练兵指导帮扶结果Controller
+ *
+ * @author qianhe
+ * @date 2025-08-19
+ */
+@RestController
+@RequestMapping("/system/SjGfjsLbzdbfJg")
+public class SjGfjsLbzdbfJgController extends BaseController
+{
+    @Autowired
+    private ISjGfjsLbzdbfJgService sjGfjsLbzdbfJgService;
+
+    /**
+     * 查询规范建设-练兵指导帮扶结果列表
+     */
+
+    @GetMapping("/list")
+    public TableDataInfo list(SjGfjsLbzdbfJg sjGfjsLbzdbfJg)
+    {
+        startPage();
+        List<SjGfjsLbzdbfJg> list = sjGfjsLbzdbfJgService.selectSjGfjsLbzdbfJgList(sjGfjsLbzdbfJg);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出规范建设-练兵指导帮扶结果列表
+     */
+
+    @Log(title = "规范建设-练兵指导帮扶结果", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SjGfjsLbzdbfJg sjGfjsLbzdbfJg)
+    {
+        List<SjGfjsLbzdbfJg> list = sjGfjsLbzdbfJgService.selectSjGfjsLbzdbfJgList(sjGfjsLbzdbfJg);
+        ExcelUtil<SjGfjsLbzdbfJg> util = new ExcelUtil<SjGfjsLbzdbfJg>(SjGfjsLbzdbfJg.class);
+        util.exportExcel(response, list, "规范建设-练兵指导帮扶结果数据");
+    }
+
+    /**
+     * 获取规范建设-练兵指导帮扶结果详细信息
+     */
+
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(sjGfjsLbzdbfJgService.selectSjGfjsLbzdbfJgById(id));
+    }
+
+    /**
+     * 新增规范建设-练兵指导帮扶结果
+     */
+
+    @Log(title = "规范建设-练兵指导帮扶结果", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SjGfjsLbzdbfJg sjGfjsLbzdbfJg)
+    {
+        return toAjax(sjGfjsLbzdbfJgService.insertSjGfjsLbzdbfJg(sjGfjsLbzdbfJg));
+    }
+
+    /**
+     * 修改规范建设-练兵指导帮扶结果
+     */
+
+    @Log(title = "规范建设-练兵指导帮扶结果", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SjGfjsLbzdbfJg sjGfjsLbzdbfJg)
+    {
+        return toAjax(sjGfjsLbzdbfJgService.updateSjGfjsLbzdbfJg(sjGfjsLbzdbfJg));
+    }
+
+    /**
+     * 删除规范建设-练兵指导帮扶结果
+     */
+
+    @Log(title = "规范建设-练兵指导帮扶结果", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(sjGfjsLbzdbfJgService.deleteSjGfjsLbzdbfJgByIds(ids));
+    }
+}

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

@@ -277,6 +277,7 @@ public class SjGfjsZsdwkhpjController extends BaseController
     @PostMapping("/export")
     public void export(HttpServletResponse response, SjGfjsZsdwkhpj sjGfjsZsdwkhpj)
     {
+        sjGfjsZsdwkhpj.setJb("直属单位");
         List<SjGfjsZsdwkhpj> list = sjGfjsZsdwkhpjService.selectSjGfjsZsdwkhpjList(sjGfjsZsdwkhpj);
 
         Workbook exl = null;

qianhe-ydsj/src/main/java/com/qianhe/domain/SjGfjsLbzdbf.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_gfjs_lbzdbf
+ *
+ * @author qianhe
+ * @date 2025-08-19
+ */
+public class SjGfjsLbzdbf extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 帮扶组名称 */
+    @Excel(name = "帮扶组名称")
+    private String bfzmc;
+
+    /** 联系人 */
+    @Excel(name = "联系人")
+    private Long lxr;
+
+    private String lxrname;
+
+    /** 年度 */
+    @Excel(name = "年度")
+    private String nd;
+
+    /** 预留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 setBfzmc(String bfzmc)
+    {
+        this.bfzmc = bfzmc;
+    }
+
+    public String getBfzmc()
+    {
+        return bfzmc;
+    }
+    public void setLxr(Long lxr)
+    {
+        this.lxr = lxr;
+    }
+
+    public Long getLxr()
+    {
+        return lxr;
+    }
+    public void setNd(String nd)
+    {
+        this.nd = nd;
+    }
+
+    public String getNd()
+    {
+        return nd;
+    }
+    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("bfzmc", getBfzmc())
+            .append("lxr", getLxr())
+            .append("nd", getNd())
+            .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();
+    }
+
+    public String getLxrname() {
+        return lxrname;
+    }
+
+    public void setLxrname(String lxrname) {
+        this.lxrname = lxrname;
+    }
+}

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

+package com.qianhe.domain;
+
+import java.math.BigDecimal;
+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_gfjs_lbzdbf_jg
+ *
+ * @author qianhe
+ * @date 2025-08-19
+ */
+public class SjGfjsLbzdbfJg extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 主表id */
+    @Excel(name = "主表id")
+    private Long zbId;
+
+    /** 单位id */
+    @Excel(name = "单位id")
+    private Long deptId;
+
+    private String deptName;
+
+    /** 标准操作平均分 */
+    @Excel(name = "标准操作平均分")
+    private BigDecimal jg1;
+
+    /** 团队应急平均分 */
+    @Excel(name = "团队应急平均分")
+    private BigDecimal jg2;
+
+    /** 个人应急平均分 */
+    @Excel(name = "个人应急平均分")
+    private BigDecimal jg3;
+
+    /** 实操演练总分 */
+    @Excel(name = "实操演练总分")
+    private BigDecimal jg4;
+
+    /** 作业监督得分 */
+    @Excel(name = "作业监督得分")
+    private BigDecimal jg5;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private BigDecimal jg6;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private BigDecimal jg7;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private BigDecimal jg8;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private BigDecimal jg9;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private BigDecimal jg10;
+
+    /** 预留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 setDeptId(Long deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId()
+    {
+        return deptId;
+    }
+    public void setJg1(BigDecimal jg1)
+    {
+        this.jg1 = jg1;
+    }
+
+    public BigDecimal getJg1()
+    {
+        return jg1;
+    }
+    public void setJg2(BigDecimal jg2)
+    {
+        this.jg2 = jg2;
+    }
+
+    public BigDecimal getJg2()
+    {
+        return jg2;
+    }
+    public void setJg3(BigDecimal jg3)
+    {
+        this.jg3 = jg3;
+    }
+
+    public BigDecimal getJg3()
+    {
+        return jg3;
+    }
+    public void setJg4(BigDecimal jg4)
+    {
+        this.jg4 = jg4;
+    }
+
+    public BigDecimal getJg4()
+    {
+        return jg4;
+    }
+    public void setJg5(BigDecimal jg5)
+    {
+        this.jg5 = jg5;
+    }
+
+    public BigDecimal getJg5()
+    {
+        return jg5;
+    }
+    public void setJg6(BigDecimal jg6)
+    {
+        this.jg6 = jg6;
+    }
+
+    public BigDecimal getJg6()
+    {
+        return jg6;
+    }
+    public void setJg7(BigDecimal jg7)
+    {
+        this.jg7 = jg7;
+    }
+
+    public BigDecimal getJg7()
+    {
+        return jg7;
+    }
+    public void setJg8(BigDecimal jg8)
+    {
+        this.jg8 = jg8;
+    }
+
+    public BigDecimal getJg8()
+    {
+        return jg8;
+    }
+    public void setJg9(BigDecimal jg9)
+    {
+        this.jg9 = jg9;
+    }
+
+    public BigDecimal getJg9()
+    {
+        return jg9;
+    }
+    public void setJg10(BigDecimal jg10)
+    {
+        this.jg10 = jg10;
+    }
+
+    public BigDecimal getJg10()
+    {
+        return jg10;
+    }
+    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("deptId", getDeptId())
+            .append("jg1", getJg1())
+            .append("jg2", getJg2())
+            .append("jg3", getJg3())
+            .append("jg4", getJg4())
+            .append("jg5", getJg5())
+            .append("jg6", getJg6())
+            .append("jg7", getJg7())
+            .append("jg8", getJg8())
+            .append("jg9", getJg9())
+            .append("jg10", getJg10())
+            .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();
+    }
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+}

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

+package com.qianhe.mapper;
+
+import java.util.List;
+import com.qianhe.domain.SjGfjsLbzdbfJg;
+
+/**
+ * 规范建设-练兵指导帮扶结果Mapper接口
+ * 
+ * @author qianhe
+ * @date 2025-08-19
+ */
+public interface SjGfjsLbzdbfJgMapper 
+{
+    /**
+     * 查询规范建设-练兵指导帮扶结果
+     * 
+     * @param id 规范建设-练兵指导帮扶结果主键
+     * @return 规范建设-练兵指导帮扶结果
+     */
+    public SjGfjsLbzdbfJg selectSjGfjsLbzdbfJgById(Long id);
+
+    /**
+     * 查询规范建设-练兵指导帮扶结果列表
+     * 
+     * @param sjGfjsLbzdbfJg 规范建设-练兵指导帮扶结果
+     * @return 规范建设-练兵指导帮扶结果集合
+     */
+    public List<SjGfjsLbzdbfJg> selectSjGfjsLbzdbfJgList(SjGfjsLbzdbfJg sjGfjsLbzdbfJg);
+
+    /**
+     * 新增规范建设-练兵指导帮扶结果
+     * 
+     * @param sjGfjsLbzdbfJg 规范建设-练兵指导帮扶结果
+     * @return 结果
+     */
+    public int insertSjGfjsLbzdbfJg(SjGfjsLbzdbfJg sjGfjsLbzdbfJg);
+
+    /**
+     * 修改规范建设-练兵指导帮扶结果
+     * 
+     * @param sjGfjsLbzdbfJg 规范建设-练兵指导帮扶结果
+     * @return 结果
+     */
+    public int updateSjGfjsLbzdbfJg(SjGfjsLbzdbfJg sjGfjsLbzdbfJg);
+
+    /**
+     * 删除规范建设-练兵指导帮扶结果
+     * 
+     * @param id 规范建设-练兵指导帮扶结果主键
+     * @return 结果
+     */
+    public int deleteSjGfjsLbzdbfJgById(Long id);
+
+    /**
+     * 批量删除规范建设-练兵指导帮扶结果
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSjGfjsLbzdbfJgByIds(Long[] ids);
+}

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

+package com.qianhe.mapper;
+
+import java.util.List;
+import com.qianhe.domain.SjGfjsLbzdbf;
+
+/**
+ * 规范建设-练兵指导帮扶Mapper接口
+ * 
+ * @author qianhe
+ * @date 2025-08-19
+ */
+public interface SjGfjsLbzdbfMapper 
+{
+    /**
+     * 查询规范建设-练兵指导帮扶
+     * 
+     * @param id 规范建设-练兵指导帮扶主键
+     * @return 规范建设-练兵指导帮扶
+     */
+    public SjGfjsLbzdbf selectSjGfjsLbzdbfById(Long id);
+
+    /**
+     * 查询规范建设-练兵指导帮扶列表
+     * 
+     * @param sjGfjsLbzdbf 规范建设-练兵指导帮扶
+     * @return 规范建设-练兵指导帮扶集合
+     */
+    public List<SjGfjsLbzdbf> selectSjGfjsLbzdbfList(SjGfjsLbzdbf sjGfjsLbzdbf);
+
+    /**
+     * 新增规范建设-练兵指导帮扶
+     * 
+     * @param sjGfjsLbzdbf 规范建设-练兵指导帮扶
+     * @return 结果
+     */
+    public int insertSjGfjsLbzdbf(SjGfjsLbzdbf sjGfjsLbzdbf);
+
+    /**
+     * 修改规范建设-练兵指导帮扶
+     * 
+     * @param sjGfjsLbzdbf 规范建设-练兵指导帮扶
+     * @return 结果
+     */
+    public int updateSjGfjsLbzdbf(SjGfjsLbzdbf sjGfjsLbzdbf);
+
+    /**
+     * 删除规范建设-练兵指导帮扶
+     * 
+     * @param id 规范建设-练兵指导帮扶主键
+     * @return 结果
+     */
+    public int deleteSjGfjsLbzdbfById(Long id);
+
+    /**
+     * 批量删除规范建设-练兵指导帮扶
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSjGfjsLbzdbfByIds(Long[] ids);
+}

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

+package com.qianhe.service;
+
+import java.util.List;
+import com.qianhe.domain.SjGfjsLbzdbfJg;
+
+/**
+ * 规范建设-练兵指导帮扶结果Service接口
+ * 
+ * @author qianhe
+ * @date 2025-08-19
+ */
+public interface ISjGfjsLbzdbfJgService 
+{
+    /**
+     * 查询规范建设-练兵指导帮扶结果
+     * 
+     * @param id 规范建设-练兵指导帮扶结果主键
+     * @return 规范建设-练兵指导帮扶结果
+     */
+    public SjGfjsLbzdbfJg selectSjGfjsLbzdbfJgById(Long id);
+
+    /**
+     * 查询规范建设-练兵指导帮扶结果列表
+     * 
+     * @param sjGfjsLbzdbfJg 规范建设-练兵指导帮扶结果
+     * @return 规范建设-练兵指导帮扶结果集合
+     */
+    public List<SjGfjsLbzdbfJg> selectSjGfjsLbzdbfJgList(SjGfjsLbzdbfJg sjGfjsLbzdbfJg);
+
+    /**
+     * 新增规范建设-练兵指导帮扶结果
+     * 
+     * @param sjGfjsLbzdbfJg 规范建设-练兵指导帮扶结果
+     * @return 结果
+     */
+    public int insertSjGfjsLbzdbfJg(SjGfjsLbzdbfJg sjGfjsLbzdbfJg);
+
+    /**
+     * 修改规范建设-练兵指导帮扶结果
+     * 
+     * @param sjGfjsLbzdbfJg 规范建设-练兵指导帮扶结果
+     * @return 结果
+     */
+    public int updateSjGfjsLbzdbfJg(SjGfjsLbzdbfJg sjGfjsLbzdbfJg);
+
+    /**
+     * 批量删除规范建设-练兵指导帮扶结果
+     * 
+     * @param ids 需要删除的规范建设-练兵指导帮扶结果主键集合
+     * @return 结果
+     */
+    public int deleteSjGfjsLbzdbfJgByIds(Long[] ids);
+
+    /**
+     * 删除规范建设-练兵指导帮扶结果信息
+     * 
+     * @param id 规范建设-练兵指导帮扶结果主键
+     * @return 结果
+     */
+    public int deleteSjGfjsLbzdbfJgById(Long id);
+}

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

+package com.qianhe.service;
+
+import java.util.List;
+import com.qianhe.domain.SjGfjsLbzdbf;
+
+/**
+ * 规范建设-练兵指导帮扶Service接口
+ * 
+ * @author qianhe
+ * @date 2025-08-19
+ */
+public interface ISjGfjsLbzdbfService 
+{
+    /**
+     * 查询规范建设-练兵指导帮扶
+     * 
+     * @param id 规范建设-练兵指导帮扶主键
+     * @return 规范建设-练兵指导帮扶
+     */
+    public SjGfjsLbzdbf selectSjGfjsLbzdbfById(Long id);
+
+    /**
+     * 查询规范建设-练兵指导帮扶列表
+     * 
+     * @param sjGfjsLbzdbf 规范建设-练兵指导帮扶
+     * @return 规范建设-练兵指导帮扶集合
+     */
+    public List<SjGfjsLbzdbf> selectSjGfjsLbzdbfList(SjGfjsLbzdbf sjGfjsLbzdbf);
+
+    /**
+     * 新增规范建设-练兵指导帮扶
+     * 
+     * @param sjGfjsLbzdbf 规范建设-练兵指导帮扶
+     * @return 结果
+     */
+    public int insertSjGfjsLbzdbf(SjGfjsLbzdbf sjGfjsLbzdbf);
+
+    /**
+     * 修改规范建设-练兵指导帮扶
+     * 
+     * @param sjGfjsLbzdbf 规范建设-练兵指导帮扶
+     * @return 结果
+     */
+    public int updateSjGfjsLbzdbf(SjGfjsLbzdbf sjGfjsLbzdbf);
+
+    /**
+     * 批量删除规范建设-练兵指导帮扶
+     * 
+     * @param ids 需要删除的规范建设-练兵指导帮扶主键集合
+     * @return 结果
+     */
+    public int deleteSjGfjsLbzdbfByIds(Long[] ids);
+
+    /**
+     * 删除规范建设-练兵指导帮扶信息
+     * 
+     * @param id 规范建设-练兵指导帮扶主键
+     * @return 结果
+     */
+    public int deleteSjGfjsLbzdbfById(Long id);
+}

qianhe-ydsj/src/main/java/com/qianhe/service/impl/SjGfjsLbzdbfJgServiceImpl.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 com.qianhe.mapper.SjGfjsLbzdbfJgMapper;
+import com.qianhe.domain.SjGfjsLbzdbfJg;
+import com.qianhe.service.ISjGfjsLbzdbfJgService;
+
+/**
+ * 规范建设-练兵指导帮扶结果Service业务层处理
+ *
+ * @author qianhe
+ * @date 2025-08-19
+ */
+@Service
+public class SjGfjsLbzdbfJgServiceImpl implements ISjGfjsLbzdbfJgService
+{
+    @Autowired
+    private SjGfjsLbzdbfJgMapper sjGfjsLbzdbfJgMapper;
+
+    /**
+     * 查询规范建设-练兵指导帮扶结果
+     *
+     * @param id 规范建设-练兵指导帮扶结果主键
+     * @return 规范建设-练兵指导帮扶结果
+     */
+    @Override
+    public SjGfjsLbzdbfJg selectSjGfjsLbzdbfJgById(Long id)
+    {
+        return sjGfjsLbzdbfJgMapper.selectSjGfjsLbzdbfJgById(id);
+    }
+
+    /**
+     * 查询规范建设-练兵指导帮扶结果列表
+     *
+     * @param sjGfjsLbzdbfJg 规范建设-练兵指导帮扶结果
+     * @return 规范建设-练兵指导帮扶结果
+     */
+    @Override
+    public List<SjGfjsLbzdbfJg> selectSjGfjsLbzdbfJgList(SjGfjsLbzdbfJg sjGfjsLbzdbfJg)
+    {
+        return sjGfjsLbzdbfJgMapper.selectSjGfjsLbzdbfJgList(sjGfjsLbzdbfJg);
+    }
+
+    /**
+     * 新增规范建设-练兵指导帮扶结果
+     *
+     * @param sjGfjsLbzdbfJg 规范建设-练兵指导帮扶结果
+     * @return 结果
+     */
+    @Override
+    public int insertSjGfjsLbzdbfJg(SjGfjsLbzdbfJg sjGfjsLbzdbfJg)
+    {
+        sjGfjsLbzdbfJg.setCreateTime(DateUtils.getNowDate());
+        sjGfjsLbzdbfJg.setCreateBy(SecurityUtils.getUsername());
+        return sjGfjsLbzdbfJgMapper.insertSjGfjsLbzdbfJg(sjGfjsLbzdbfJg);
+    }
+
+    /**
+     * 修改规范建设-练兵指导帮扶结果
+     *
+     * @param sjGfjsLbzdbfJg 规范建设-练兵指导帮扶结果
+     * @return 结果
+     */
+    @Override
+    public int updateSjGfjsLbzdbfJg(SjGfjsLbzdbfJg sjGfjsLbzdbfJg)
+    {
+        sjGfjsLbzdbfJg.setUpdateTime(DateUtils.getNowDate());
+        sjGfjsLbzdbfJg.setUpdateBy(SecurityUtils.getUsername());
+        return sjGfjsLbzdbfJgMapper.updateSjGfjsLbzdbfJg(sjGfjsLbzdbfJg);
+    }
+
+    /**
+     * 批量删除规范建设-练兵指导帮扶结果
+     *
+     * @param ids 需要删除的规范建设-练兵指导帮扶结果主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSjGfjsLbzdbfJgByIds(Long[] ids)
+    {
+        return sjGfjsLbzdbfJgMapper.deleteSjGfjsLbzdbfJgByIds(ids);
+    }
+
+    /**
+     * 删除规范建设-练兵指导帮扶结果信息
+     *
+     * @param id 规范建设-练兵指导帮扶结果主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSjGfjsLbzdbfJgById(Long id)
+    {
+        return sjGfjsLbzdbfJgMapper.deleteSjGfjsLbzdbfJgById(id);
+    }
+}

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

+package com.qianhe.service.impl;
+
+import java.util.List;
+import com.qianhe.common.utils.DateUtils;
+import com.qianhe.common.utils.SecurityUtils;
+import com.qianhe.system.domain.SysUserRole;
+import com.qianhe.system.mapper.SysUserRoleMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.qianhe.mapper.SjGfjsLbzdbfMapper;
+import com.qianhe.domain.SjGfjsLbzdbf;
+import com.qianhe.service.ISjGfjsLbzdbfService;
+
+/**
+ * 规范建设-练兵指导帮扶Service业务层处理
+ *
+ * @author qianhe
+ * @date 2025-08-19
+ */
+@Service
+public class SjGfjsLbzdbfServiceImpl implements ISjGfjsLbzdbfService
+{
+    @Autowired
+    private SjGfjsLbzdbfMapper sjGfjsLbzdbfMapper;
+
+    /**
+     * 查询规范建设-练兵指导帮扶
+     *
+     * @param id 规范建设-练兵指导帮扶主键
+     * @return 规范建设-练兵指导帮扶
+     */
+    @Override
+    public SjGfjsLbzdbf selectSjGfjsLbzdbfById(Long id)
+    {
+        return sjGfjsLbzdbfMapper.selectSjGfjsLbzdbfById(id);
+    }
+
+    /**
+     * 查询规范建设-练兵指导帮扶列表
+     *
+     * @param sjGfjsLbzdbf 规范建设-练兵指导帮扶
+     * @return 规范建设-练兵指导帮扶
+     */
+    @Override
+    public List<SjGfjsLbzdbf> selectSjGfjsLbzdbfList(SjGfjsLbzdbf sjGfjsLbzdbf)
+    {
+        return sjGfjsLbzdbfMapper.selectSjGfjsLbzdbfList(sjGfjsLbzdbf);
+    }
+
+    /**
+     * 新增规范建设-练兵指导帮扶
+     *
+     * @param sjGfjsLbzdbf 规范建设-练兵指导帮扶
+     * @return 结果
+     */
+    @Autowired
+    private SysUserRoleMapper userRoleMapper;
+    @Override
+    public int insertSjGfjsLbzdbf(SjGfjsLbzdbf sjGfjsLbzdbf)
+    {
+        // 给联系人一个帮扶组角色
+        SysUserRole userRole = new SysUserRole();
+        userRole.setUserId(sjGfjsLbzdbf.getLxr());
+        userRole.setRoleId(new Long(106));
+        userRoleMapper.deleteUserRoleInfo(userRole);
+        userRoleMapper.insertUserRole(userRole);
+
+        sjGfjsLbzdbf.setCreateTime(DateUtils.getNowDate());
+        sjGfjsLbzdbf.setCreateBy(SecurityUtils.getUsername());
+        return sjGfjsLbzdbfMapper.insertSjGfjsLbzdbf(sjGfjsLbzdbf);
+    }
+
+    /**
+     * 修改规范建设-练兵指导帮扶
+     *
+     * @param sjGfjsLbzdbf 规范建设-练兵指导帮扶
+     * @return 结果
+     */
+    @Override
+    public int updateSjGfjsLbzdbf(SjGfjsLbzdbf sjGfjsLbzdbf)
+    {
+        // 给联系人一个帮扶组角色
+        SysUserRole userRole = new SysUserRole();
+        userRole.setUserId(sjGfjsLbzdbf.getLxr());
+        userRole.setRoleId(new Long(106));
+        userRoleMapper.deleteUserRoleInfo(userRole);
+        userRoleMapper.insertUserRole(userRole);
+
+        sjGfjsLbzdbf.setUpdateTime(DateUtils.getNowDate());
+        sjGfjsLbzdbf.setUpdateBy(SecurityUtils.getUsername());
+        return sjGfjsLbzdbfMapper.updateSjGfjsLbzdbf(sjGfjsLbzdbf);
+    }
+
+    /**
+     * 批量删除规范建设-练兵指导帮扶
+     *
+     * @param ids 需要删除的规范建设-练兵指导帮扶主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSjGfjsLbzdbfByIds(Long[] ids)
+    {
+        return sjGfjsLbzdbfMapper.deleteSjGfjsLbzdbfByIds(ids);
+    }
+
+    /**
+     * 删除规范建设-练兵指导帮扶信息
+     *
+     * @param id 规范建设-练兵指导帮扶主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSjGfjsLbzdbfById(Long id)
+    {
+        return sjGfjsLbzdbfMapper.deleteSjGfjsLbzdbfById(id);
+    }
+}

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

@@ -56,10 +56,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                a.yl3,
                a.yl4,
                a.yl5,
-               d.dept_name,d.dept_lx,
+                CONCAT(p.dept_name,'/',d.dept_name) dept_name,
+               d.dept_lx,
                 b.bfzmc as yl3name
         from sj_gfjs_zsdwwtcj a
                  left join sys_dept d on a.dept_id=d.dept_id
+                  LEFT JOIN  sys_dept p on d.parent_id = p.dept_id
                  left join sj_gfjs_bfzwh b on a.yl3 = b.id
         </sql>
 

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

@@ -74,11 +74,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                yl2,
                yl3,
                yl4,
-               yl5, sfczwt, a.zt, d.dept_name,d.dept_lx,
+               yl5, sfczwt, a.zt,
+                 CONCAT(p.dept_name,'/',d.dept_name) dept_name,
+               d.dept_lx,
                (select count(id) from sj_gfjs_zsdwwtcj c where a.id = c.pid ) as wtzs,
                (select count(id) from sj_gfjs_zsdwwtcj c where a.id = c.pid and c.zgzt = '已整改' ) as yzgsl
         from sj_gfjs_ydjcjl a
         left join sys_dept d on a.dept_id=d.dept_id
+         LEFT JOIN  sys_dept p on d.parent_id = p.dept_id
     </sql>
     <select id="selectSjGfjsYdjcjlList" parameterType="SjGfjsYdjcjl" resultMap="SjGfjsYdjcjlResult">
         <include refid="selectSjGfjsYdjcjlVo"/>

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

@@ -44,10 +44,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                yl2,
                yl3,
                yl4,
-               yl5,zt,d.dept_name,
+               yl5,zt,
+                 CONCAT(p.dept_name,'/',d.dept_name) dept_name,
                  c.dept_name as yl3name
         from sj_gfjs_zsdwfjxcj a
                  left join  sys_dept d on a.dept_id=d.dept_id
+                     LEFT JOIN  sys_dept p on d.parent_id = p.dept_id
                   left join sys_dept c on a.yl3=c.dept_id
 </sql>
 

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

@@ -52,14 +52,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                a.create_time,
                a.update_by,
                a.update_time,
-               remark,
-               yl1,
-               yl2,
-               yl3,
-               yl4,
-               yl5, pid, zt, d.dept_name,d.dept_lx
+               a.remark,
+               a.yl1,
+               a.yl2,
+               a.yl3,
+               a.yl4,
+               a.yl5, a.pid, a.zt,
+                 CONCAT(p.dept_name,'/',d.dept_name) dept_name,
+                d.dept_lx
         from sj_gfjs_zsdwwtcj a
                  left join sys_dept d on a.dept_id=d.dept_id
+                  LEFT JOIN  sys_dept p on d.parent_id = p.dept_id
         </sql>
 
     <select id="selectSjGfjsZsdwwtcjList" parameterType="SjGfjsZsdwwtcj" resultMap="SjGfjsZsdwwtcjResult">

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

@@ -24,20 +24,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectSjZdscVo">
         select a.id, a.dept_id, a.lx, a.zdmc, a.bb, a.fjms, a.zt, a.xzcs, a.create_by, a.create_time,
                a.update_by, a.update_time, a.remark,
-               d.dept_name
+                CONCAT(p.dept_name,'/',d.dept_name) dept_name
           from sj_zdsc a
           left join sys_dept d on a.dept_id=d.dept_id
+            LEFT JOIN  sys_dept p on d.parent_id = p.dept_id
     </sql>
     <select id="selectSjZdscList" parameterType="SjZdsc" resultMap="SjZdscResult">
         <include refid="selectSjZdscVo"/>
         <where>
             <if test="deptId != null ">and (a.dept_id = #{deptId} or  find_in_set(#{deptId},d.ancestors))</if>
-            <if test="lx != null  and lx != ''"> and lx = #{lx}</if>
-            <if test="zdmc != null  and zdmc != ''"> and zdmc = #{zdmc}</if>
-            <if test="bb != null  and bb != ''"> and bb = #{bb}</if>
-            <if test="fjms != null  and fjms != ''"> and fjms = #{fjms}</if>
-            <if test="zt != null  and zt != ''"> and zt = #{zt}</if>
-            <if test="xzcs != null  and xzcs != ''"> and xzcs = #{xzcs}</if>
+            <if test="lx != null  and lx != ''"> and a.lx = #{lx}</if>
+            <if test="zdmc != null  and zdmc != ''"> and a.zdmc = #{zdmc}</if>
+            <if test="bb != null  and bb != ''"> and a.bb = #{bb}</if>
+            <if test="fjms != null  and fjms != ''"> and a.fjms = #{fjms}</if>
+            <if test="zt != null  and zt != ''"> and a.zt = #{zt}</if>
+            <if test="xzcs != null  and xzcs != ''"> and a.xzcs = #{xzcs}</if>
             <!-- 数据范围过滤 -->
             ${params.dataScope}
         </where>

qianhe-ydsj/src/main/resources/mapper/system/SjGfjsLbzdbfJgMapper.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.SjGfjsLbzdbfJgMapper">
+    
+    <resultMap type="SjGfjsLbzdbfJg" id="SjGfjsLbzdbfJgResult">
+        <result property="id"    column="id"    />
+        <result property="zbId"    column="zb_id"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="jg1"    column="jg1"    />
+        <result property="jg2"    column="jg2"    />
+        <result property="jg3"    column="jg3"    />
+        <result property="jg4"    column="jg4"    />
+        <result property="jg5"    column="jg5"    />
+        <result property="jg6"    column="jg6"    />
+        <result property="jg7"    column="jg7"    />
+        <result property="jg8"    column="jg8"    />
+        <result property="jg9"    column="jg9"    />
+        <result property="jg10"    column="jg10"    />
+        <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="selectSjGfjsLbzdbfJgVo">
+        select a.id, a.zb_id, a.dept_id, a.jg1, a.jg2, a.jg3, a.jg4, a.jg5, a.jg6, a.jg7, a.jg8, a.jg9, a.jg9,
+        a.create_by, a.create_time, a.update_by, a.update_time, a.remark, a.yl1, a.yl2, a.yl3, a.yl4, a.yl5,
+          CONCAT(p.dept_name,'/',d.dept_name) dept_name
+        from sj_gfjs_lbzdbf_jg a
+        left join sys_dept d on a.dept_id=d.dept_id
+        LEFT JOIN  sys_dept p on d.parent_id = p.dept_id
+    </sql>
+
+    <select id="selectSjGfjsLbzdbfJgList" parameterType="SjGfjsLbzdbfJg" resultMap="SjGfjsLbzdbfJgResult">
+        <include refid="selectSjGfjsLbzdbfJgVo"/>
+        <where>  
+            <if test="zbId != null "> and zb_id = #{zbId}</if>
+            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="jg1 != null "> and jg1 = #{jg1}</if>
+            <if test="jg2 != null "> and jg2 = #{jg2}</if>
+            <if test="jg3 != null "> and jg3 = #{jg3}</if>
+            <if test="jg4 != null "> and jg4 = #{jg4}</if>
+            <if test="jg5 != null "> and jg5 = #{jg5}</if>
+            <if test="jg6 != null "> and jg6 = #{jg6}</if>
+            <if test="jg7 != null "> and jg7 = #{jg7}</if>
+            <if test="jg8 != null "> and jg8 = #{jg8}</if>
+            <if test="jg9 != null "> and jg9 = #{jg9}</if>
+            <if test="jg10 != null "> and jg10 = #{jg10}</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="selectSjGfjsLbzdbfJgById" parameterType="Long" resultMap="SjGfjsLbzdbfJgResult">
+        <include refid="selectSjGfjsLbzdbfJgVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertSjGfjsLbzdbfJg" parameterType="SjGfjsLbzdbfJg" useGeneratedKeys="true" keyProperty="id">
+        insert into sj_gfjs_lbzdbf_jg
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="zbId != null">zb_id,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="jg1 != null">jg1,</if>
+            <if test="jg2 != null">jg2,</if>
+            <if test="jg3 != null">jg3,</if>
+            <if test="jg4 != null">jg4,</if>
+            <if test="jg5 != null">jg5,</if>
+            <if test="jg6 != null">jg6,</if>
+            <if test="jg7 != null">jg7,</if>
+            <if test="jg8 != null">jg8,</if>
+            <if test="jg9 != null">jg9,</if>
+            <if test="jg10 != null">jg10,</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="jg1 != null">#{jg1},</if>
+            <if test="jg2 != null">#{jg2},</if>
+            <if test="jg3 != null">#{jg3},</if>
+            <if test="jg4 != null">#{jg4},</if>
+            <if test="jg5 != null">#{jg5},</if>
+            <if test="jg6 != null">#{jg6},</if>
+            <if test="jg7 != null">#{jg7},</if>
+            <if test="jg8 != null">#{jg8},</if>
+            <if test="jg9 != null">#{jg9},</if>
+            <if test="jg10 != null">#{jg10},</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="updateSjGfjsLbzdbfJg" parameterType="SjGfjsLbzdbfJg">
+        update sj_gfjs_lbzdbf_jg
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="zbId != null">zb_id = #{zbId},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="jg1 != null">jg1 = #{jg1},</if>
+            <if test="jg2 != null">jg2 = #{jg2},</if>
+            <if test="jg3 != null">jg3 = #{jg3},</if>
+            <if test="jg4 != null">jg4 = #{jg4},</if>
+            <if test="jg5 != null">jg5 = #{jg5},</if>
+            <if test="jg6 != null">jg6 = #{jg6},</if>
+            <if test="jg7 != null">jg7 = #{jg7},</if>
+            <if test="jg8 != null">jg8 = #{jg8},</if>
+            <if test="jg9 != null">jg9 = #{jg9},</if>
+            <if test="jg10 != null">jg10 = #{jg10},</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="deleteSjGfjsLbzdbfJgById" parameterType="Long">
+        delete from sj_gfjs_lbzdbf_jg where id = #{id}
+    </delete>
+
+    <delete id="deleteSjGfjsLbzdbfJgByIds" parameterType="String">
+        delete from sj_gfjs_lbzdbf_jg where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

qianhe-ydsj/src/main/resources/mapper/system/SjGfjsLbzdbfMapper.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.SjGfjsLbzdbfMapper">
+    
+    <resultMap type="SjGfjsLbzdbf" id="SjGfjsLbzdbfResult">
+        <result property="id"    column="id"    />
+        <result property="bfzmc"    column="bfzmc"    />
+        <result property="lxr"    column="lxr"    />
+        <result property="lxrname"    column="lxrname"    />
+        <result property="nd"    column="nd"    />
+        <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="selectSjGfjsLbzdbfVo">
+        select a.id, a.bfzmc, a.lxr, a.nd, s.nick_name lxrname,
+         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_gfjs_lbzdbf a
+		left join sys_user s on a.lxr = s.user_id
+    </sql>
+
+    <select id="selectSjGfjsLbzdbfList" parameterType="SjGfjsLbzdbf" resultMap="SjGfjsLbzdbfResult">
+        <include refid="selectSjGfjsLbzdbfVo"/>
+        <where>  
+            <if test="bfzmc != null  and bfzmc != ''"> and a.bfzmc = #{bfzmc}</if>
+            <if test="lxr != null "> and a.lxr = #{lxr}</if>
+            <if test="nd != null  and nd != ''"> and a.nd = #{nd}</if>
+            <if test="yl1 != null  and yl1 != ''"> and a.yl1 = #{yl1}</if>
+            <if test="yl2 != null  and yl2 != ''"> and a.yl2 = #{yl2}</if>
+            <if test="yl3 != null  and yl3 != ''"> and a.yl3 = #{yl3}</if>
+            <if test="yl4 != null  and yl4 != ''"> and a.yl4 = #{yl4}</if>
+            <if test="yl5 != null  and yl5 != ''"> and a.yl5 = #{yl5}</if>
+        </where>
+    </select>
+    
+    <select id="selectSjGfjsLbzdbfById" parameterType="Long" resultMap="SjGfjsLbzdbfResult">
+        <include refid="selectSjGfjsLbzdbfVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertSjGfjsLbzdbf" parameterType="SjGfjsLbzdbf" useGeneratedKeys="true" keyProperty="id">
+        insert into sj_gfjs_lbzdbf
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="bfzmc != null">bfzmc,</if>
+            <if test="lxr != null">lxr,</if>
+            <if test="nd != null">nd,</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="bfzmc != null">#{bfzmc},</if>
+            <if test="lxr != null">#{lxr},</if>
+            <if test="nd != null">#{nd},</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="updateSjGfjsLbzdbf" parameterType="SjGfjsLbzdbf">
+        update sj_gfjs_lbzdbf
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="bfzmc != null">bfzmc = #{bfzmc},</if>
+            <if test="lxr != null">lxr = #{lxr},</if>
+            <if test="nd != null">nd = #{nd},</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="deleteSjGfjsLbzdbfById" parameterType="Long">
+        delete from sj_gfjs_lbzdbf where id = #{id}
+    </delete>
+
+    <delete id="deleteSjGfjsLbzdbfByIds" parameterType="String">
+        delete from sj_gfjs_lbzdbf where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file