2025-07-28 规范建设 V4

69fbe7d3 · wangjian · a0662ff5 · 69fbe7d3 · 69fbe7d3 · 69fbe7d3
Commit 69fbe7d3 authored Jul 28, 2025 by wangjian
32 changed files
--- a/qianhe-ydsj/src/main/java/com/qianhe/controller/SjGfjsJcdwkhpjController.java
+++ b/qianhe-ydsj/src/main/java/com/qianhe/controller/SjGfjsJcdwkhpjController.java
@@ -39,7 +39,7 @@ import java.util.stream.Collectors;
 /**
 * 规范建设-基层单位考核评价Controller
- *
+ * 现基层单位考核评价
 * @author qianhe
 * @date 2024-07-24
 */
@@ -142,6 +142,7 @@ public class SjGfjsJcdwkhpjController extends BaseController
                sjGfjsZsdwkhpjZbnew.setDeptDfl(dept.getDeptDfl());
                sjGfjsZsdwkhpjZbnew.setDeptLx(dept.getDeptLx());
                sjGfjsZsdwkhpjZbnew.setDeptYwfl(dept.getDeptYwfl());
+                sjGfjsZsdwkhpjZbnew.setZt("0");//未提交
                sjGfjsZsdwkhpjZbService.insertSjGfjsZsdwkhpjZb(sjGfjsZsdwkhpjZbnew);
            }
@@ -193,10 +194,18 @@ public class SjGfjsJcdwkhpjController extends BaseController
        //查询考核评价
        List<SjGfjsZsdwkhpj> resjGfjsZsdwkhpjs = sjGfjsZsdwkhpjService.selectSjGfjsZsdwkhpjList(sjGfjsZsdwkhpj);
+        //查询主表信息
+        SjGfjsZsdwkhpjZb zb_qry = new SjGfjsZsdwkhpjZb();
+        zb_qry.setNd(nd);
+        zb_qry.setDeptId(deptId);
+        zb_qry.setZqfw(sjGfjsZsdwkhpj.getZqfw());
+        SjGfjsZsdwkhpjZb zb =sjGfjsZsdwkhpjZbService.selectSjGfjsZsdwkhpjZb(zb_qry);
+        String zt = zb.getZt();
        map.put("code",HttpStatus.SUCCESS);
        map.put("msg","查询成功");
        map.put("khpjData",resjGfjsZsdwkhpjs);
+        map.put("zt", zt);
        return  map;
    }
@@ -208,6 +217,7 @@ public class SjGfjsJcdwkhpjController extends BaseController
    public void export(HttpServletResponse response, SjGfjsZsdwkhpj sjGfjsZsdwkhpj)
    {
        List<SjGfjsZsdwkhpj> list = sjGfjsZsdwkhpjService.selectSjGfjsZsdwkhpjList(sjGfjsZsdwkhpj);
        Workbook exl = null;
        OutputStream out = null;
        InputStream in  = null;
@@ -221,8 +231,8 @@ public class SjGfjsJcdwkhpjController extends BaseController
            response.setCharacterEncoding("UTF-8");
            response.setHeader("Content-Disposition", "attachment;filename=" + filename);
            response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
            Sheet sheet = exl.getSheet("Sheet1");
-//            sheet.getRow(0).getCell(0).setCellValue(sjGfjsZsdwkhpj.getNd()+"年"+sjGfjsZsdwkhpj.getZqfw()+sjGfjsZsdwkhpj.getDeptName());
            CellStyle cellStyle = exl.createCellStyle();
            cellStyle.setWrapText(true);
            cellStyle.setAlignment(HorizontalAlignment.LEFT);
@@ -235,6 +245,7 @@ public class SjGfjsJcdwkhpjController extends BaseController
            cellStyle.setRightBorderColor(IndexedColors.BLACK.getIndex());
            cellStyle.setBorderTop(BorderStyle.THIN);
            cellStyle.setTopBorderColor(IndexedColors.BLACK.getIndex());
            String deptName="";
            int lastRow = sheet.getLastRowNum()+1;
            for( SjGfjsZsdwkhpj zsdwkhpj:list){
@@ -246,7 +257,7 @@ public class SjGfjsJcdwkhpjController extends BaseController
                cell = row.createCell(m++);cell.setCellStyle(cellStyle); cell.setCellValue(zsdwkhpj.getKhxd());
                cell = row.createCell(m++);cell.setCellStyle(cellStyle); cell.setCellValue(zsdwkhpj.getPjbzmc());
                cell = row.createCell(m++);cell.setCellStyle(cellStyle); cell.setCellValue(zsdwkhpj.getSj());
-                cell = row.createCell(m++);cell.setCellStyle(cellStyle); cell.setCellValue(zsdwkhpj. getWtms());
+                cell = row.createCell(m++);cell.setCellStyle(cellStyle); cell.setCellValue(zsdwkhpj.getWtms());
                cell = row.createCell(m++);cell.setCellStyle(cellStyle); cell.setCellValue(zsdwkhpj.getKhfz());
                cell = row.createCell(m++);cell.setCellStyle(cellStyle); cell.setCellValue(zsdwkhpj.getId());
                cell = row.createCell(m++);cell.setCellStyle(cellStyle); cell.setCellValue(zsdwkhpj.getZbId());
@@ -256,6 +267,7 @@ public class SjGfjsJcdwkhpjController extends BaseController
            mergeCellsByColumn(sheet,0);
            mergeCellsByColumn(sheet,1);
            sheet.getRow(0).getCell(0).setCellValue(sjGfjsZsdwkhpj.getNd()+sjGfjsZsdwkhpj.getZqfw()+deptName+"考核评价");
            exl.write(out);
            exl.close();
        }catch (Exception e){
@@ -366,6 +378,20 @@ public class SjGfjsJcdwkhpjController extends BaseController
    {
        return toAjax(sjGfjsZsdwkhpjService.pledit(list));
    }
+    /**
+     * 修改并提交 规范建设-基层单位考核评价
+     */
+    @Log(title = "修改并提交 规范建设-基层单位考核评价", businessType = BusinessType.UPDATE)
+    @PutMapping("/pleditAndTj")
+    public AjaxResult pleditAndTj(@RequestBody List<SjGfjsZsdwkhpj> list)
+    {
+        sjGfjsZsdwkhpjService.pledit(list);
+        SjGfjsZsdwkhpj sjGfjsZsdwkhpj = list.get(0);
+        SjGfjsZsdwkhpjZb zb = sjGfjsZsdwkhpjZbService.selectSjGfjsZsdwkhpjZbById(sjGfjsZsdwkhpj.getZbId());
+        zb.setZt("1");
+        return toAjax(sjGfjsZsdwkhpjZbService.updateSjGfjsZsdwkhpjZb(zb));
+    }
    @PostMapping("/importData")
@@ -403,13 +429,13 @@ public class SjGfjsJcdwkhpjController extends BaseController
                    return AjaxResult.error("主表id不能为空");
                }
                zsdwkhpj.setZbId(Long.parseLong(zbid));
-                String khnr=new DataFormatter().formatCellValue(row.getCell(1));
+                String khnr=new DataFormatter().formatCellValue(row.getCell(0));
                zsdwkhpj.setKhnr(khnr);
-                String xd=new DataFormatter().formatCellValue(row.getCell(2));
+                String xd=new DataFormatter().formatCellValue(row.getCell(1));
                zsdwkhpj.setKhxd(xd);
-                String pj=new DataFormatter().formatCellValue(row.getCell(3));
+                String pj=new DataFormatter().formatCellValue(row.getCell(2));
                zsdwkhpj.setPjbzmc(pj);
                //数量
                String sl=new DataFormatter().formatCellValue(row.getCell(3));

--- a/qianhe-ydsj/src/main/java/com/qianhe/controller/SjGfjsJgbmjcController.java
+++ b/qianhe-ydsj/src/main/java/com/qianhe/controller/SjGfjsJgbmjcController.java
@@ -38,7 +38,7 @@ import java.util.List;
 /**
 * 规范建设-机关部门检查Controller
- *
+ * 现作废
 * @author qianhe
 * @date 2024-07-23
 */

--- a/qianhe-ydsj/src/main/java/com/qianhe/controller/SjGfjsYdjcjlController.java
+++ b/qianhe-ydsj/src/main/java/com/qianhe/controller/SjGfjsYdjcjlController.java
@@ -13,12 +13,11 @@ import com.qianhe.common.utils.StringUtils;
 import com.qianhe.domain.SjGfjsYdjcjl;
 import com.qianhe.domain.SjGfjsZdgzCb;
 import com.qianhe.domain.SjGfjsZsdwwtcj;
+import com.qianhe.domain.SjZdbfZsdwkhpj;
 import com.qianhe.mapper.SjGfjsZdgzMapper;
 import com.qianhe.service.ISjGfjsYdjcjlService;
 import com.qianhe.system.mapper.SysDeptMapper;
-import org.apache.poi.ss.usermodel.DataFormatter;
+import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.usermodel.WorkbookFactory;
 import org.apache.poi.xssf.usermodel.XSSFRow;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -39,7 +38,7 @@ import java.util.List;
 /**
 * 规范建设 月度检查记录Controller
- *
+ * 现基层单位问题采集
 * @author qianhe
 * @date 2025-07-10
 */
@@ -71,7 +70,7 @@ public class SjGfjsYdjcjlController extends BaseController
     */
    @Log(title = "规范建设 月度检查记录", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
-    public void export(HttpServletResponse response, SjGfjsYdjcjl sjGfjsYdjcjl)
+    public void export(HttpServletResponse response, SjGfjsYdjcjl ydjl)
    {
        Workbook exl = null;
        OutputStream out = null;
@@ -106,7 +105,95 @@ public class SjGfjsYdjcjlController extends BaseController
                }
            }
        }
+    }
+    //导出 月度检查记录详细 带从表信息 类似 采油管理一区2025-07.xlsx
+    @Log(title = "规范建设 月度检查记录详细", businessType = BusinessType.EXPORT)
+    @PostMapping("/exportXx")
+    public void exportXx(HttpServletResponse response, SjGfjsYdjcjl ydjl)
+    {
+        //根据id查询 从表数据
+        Long id = ydjl.getId();
+        ydjl = sjGfjsYdjcjlService.selectSjGfjsYdjcjlById(id);
+        String rq = ydjl.getRq();
+        String dwmc = ydjl.getDeptName();
+        Workbook exl = null;
+        OutputStream out = null;
+        InputStream in  = null;
+        try {
+            in =this.getClass().getResourceAsStream("/static/gfjs_ydjcjl_wt.xlsx");
+            exl = WorkbookFactory.create(in);
+            out = response.getOutputStream();
+            response.reset();
+            String filename = URLEncoder.encode(dwmc + " " + rq + ".xlsx", "UTF-8");
+            response.setCharacterEncoding("UTF-8");
+            response.setHeader("Content-Disposition", "attachment;filename=" + filename);
+            response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
+            dcExcelCb(exl, ydjl);
+            exl.write(out);
+            exl.close();
+        }catch(Exception e){
+            e.getMessage();
+            throw new BusinessException("导出Excel失败，请联系网站管理员！");
+        }finally{
+            if (exl != null) {
+                try {
+                    exl.close();
+                } catch (IOException e1) {
+                    e1.printStackTrace();
+                }
+            }
+            if (out != null) {
+                try {
+                    out.close();
+                } catch (IOException e1) {
+                    e1.printStackTrace();
+                }
+            }
+        }
+    }
+    //导出excel 动态设置从表数据
+    private void dcExcelCb(Workbook exl, SjGfjsYdjcjl ydjl){
+        List<SjGfjsZsdwwtcj> cbList = ydjl.getSjGfjsZsdwwtcjList();
+        Sheet sheet = exl.getSheet("Sheet1");
+//            sheet.getRow(0).getCell(0).setCellValue(sjZdbfZsdwkhpj.getNd()+"年"+sjZdbfZsdwkhpj.getZqfw()+sjZdbfZsdwkhpj.getDeptName());
+        CellStyle cellStyle = exl.createCellStyle();
+        cellStyle.setWrapText(true);
+        cellStyle.setAlignment(HorizontalAlignment.LEFT);
+        cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
+        cellStyle.setBorderBottom(BorderStyle.THIN);
+        cellStyle.setBottomBorderColor(IndexedColors.BLACK.getIndex());
+        cellStyle.setBorderLeft(BorderStyle.THIN);
+        cellStyle.setLeftBorderColor(IndexedColors.BLACK.getIndex());
+        cellStyle.setBorderRight(BorderStyle.THIN);
+        cellStyle.setRightBorderColor(IndexedColors.BLACK.getIndex());
+        cellStyle.setBorderTop(BorderStyle.THIN);
+        cellStyle.setTopBorderColor(IndexedColors.BLACK.getIndex());
+        int lastRow = sheet.getLastRowNum()+1;
+        for(SjGfjsZsdwwtcj tmp:cbList){
+            Row row = sheet.createRow(lastRow);
+            row.setHeightInPoints(18);
+            int m = 0;
+            int xh = 1;//第一列的序号
+            Cell cell = row.createCell(m++);cell.setCellStyle(cellStyle); cell.setCellValue(xh);
+            cell = row.createCell(m++);cell.setCellStyle(cellStyle); cell.setCellValue(tmp.getWtmc());
+            cell = row.createCell(m++);cell.setCellStyle(cellStyle); cell.setCellValue(tmp.getKhnr());
+            cell = row.createCell(m++);cell.setCellStyle(cellStyle); cell.setCellValue(tmp.getKhxd());
+            cell = row.createCell(m++);cell.setCellStyle(cellStyle); cell.setCellValue(tmp.getPjbzmc());
+            cell = row.createCell(m++);cell.setCellStyle(cellStyle); cell.setCellValue(tmp.getZgzrr());
+            cell = row.createCell(m++);cell.setCellStyle(cellStyle); cell.setCellValue(tmp.getZgcs());
+            cell = row.createCell(m++);cell.setCellStyle(cellStyle); cell.setCellValue(tmp.getZgqx());
+            cell = row.createCell(m++);cell.setCellStyle(cellStyle); cell.setCellValue(tmp.getZgzt());
+            lastRow++;
+            xh++;
+        }
    }
    /**
@@ -260,6 +347,12 @@ public class SjGfjsYdjcjlController extends BaseController
    }
+    @Log(title = "规范建设 月度检查记录提交", businessType = BusinessType.UPDATE)
+    @PostMapping("/tj")
+    public AjaxResult tj(SjGfjsYdjcjl ydjl)
+    {
+        return toAjax(sjGfjsYdjcjlService.tjSjGfjsYdjcjl(ydjl));
+    }
 }
--- a/qianhe-ydsj/src/main/java/com/qianhe/controller/SjGfjsYdjcjlZsdwController.java
+++ b/qianhe-ydsj/src/main/java/com/qianhe/controller/SjGfjsYdjcjlZsdwController.java
@@ -38,7 +38,7 @@ import java.util.List;
 /**
 * 规范建设 月度检查记录Controller
- *
+ * 现作废
 * @author qianhe
 * @date 2025-07-10
 */

--- a/qianhe-ydsj/src/main/java/com/qianhe/controller/SjGfjsZsdwfjxcjController.java
+++ b/qianhe-ydsj/src/main/java/com/qianhe/controller/SjGfjsZsdwfjxcjController.java
@@ -11,6 +11,7 @@ import com.qianhe.common.utils.DateUtils;
 import com.qianhe.common.utils.SecurityUtils;
 import com.qianhe.common.utils.StringUtils;
 import com.qianhe.domain.SjGfjsKhwtCb;
+import com.qianhe.domain.SjGfjsYdjcjl;
 import com.qianhe.domain.SjGfjsZsdwfjxcj;
 import com.qianhe.mapper.SjGfjsKhwtMapper;
 import com.qianhe.service.ISjGfjsZsdwfjxcjService;
@@ -38,7 +39,7 @@ import java.util.List;
 /**
 * 规范建设-直属单位否决项采集Controller
- *
+ * 现机关单位否决项采集
 * @author qianhe
 * @date 2024-07-24
 */
@@ -232,13 +233,13 @@ public class SjGfjsZsdwfjxcjController extends BaseController
                //分类名称
                String flmc=new DataFormatter().formatCellValue(row.getCell(4)) ;
                if(StringUtils.isEmpty(flmc)){
-                    return AjaxResult.error("导入失败，第"+(i+1)+"行否决项分类不能为空");
+                    return AjaxResult.error("导入失败，第"+(i+1)+"行考核内容不能为空");
                }
                zsdwwtcj.setFlmc(flmc);
                //评价标准
                String pjbz=new DataFormatter().formatCellValue(row.getCell(5)) ;
                if(StringUtils.isEmpty(pjbz)){
-                    return AjaxResult.error("导入失败，第"+(i+1)+"行评价标准不能为空");
+                    return AjaxResult.error("导入失败，第"+(i+1)+"行问题事项不能为空");
                }
                //匹配评价标准
                String substring = pjbz.substring(4);
@@ -272,4 +273,13 @@ public class SjGfjsZsdwfjxcjController extends BaseController
        }
        return AjaxResult.success("导入成功");
    }
+    //批量提交 ids
+    @Log(title = "否决项采集提交", businessType = BusinessType.UPDATE)
+    @PostMapping("/pltj")
+    public AjaxResult pltj(SjGfjsZsdwfjxcj fjx)
+    {
+        fjx.setZt("1");
+        return toAjax(sjGfjsZsdwfjxcjService.plxg(fjx));
+    }
 }
--- a/qianhe-ydsj/src/main/java/com/qianhe/controller/SjGfjsZsdwkhpjController.java
+++ b/qianhe-ydsj/src/main/java/com/qianhe/controller/SjGfjsZsdwkhpjController.java
@@ -11,7 +11,7 @@ import com.qianhe.common.exception.BusinessException;
 import com.qianhe.common.utils.StringUtils;
 import com.qianhe.domain.*;
 import com.qianhe.mapper.SjGfjsZdgzMapper;
-import com.qianhe.mapper.SjGfjsYdjcjlMapper;
+import com.qianhe.mapper.SjGfjsZsdwwtcjMapper;
 import com.qianhe.service.ISjGfjsZsdwkhpjService;
 import com.qianhe.service.ISjGfjsZsdwkhpjZbService;
 import com.qianhe.system.mapper.SysDeptMapper;
@@ -39,7 +39,7 @@ import java.util.stream.Collectors;
 /**
 * 规范建设-直属单位考核评价Controller
- *
+ * 现直属单位考核评价
 * @author qianhe
 * @date 2024-07-24
 */
@@ -57,12 +57,10 @@ public class SjGfjsZsdwkhpjController extends BaseController
    private ISjGfjsZsdwkhpjZbService sjGfjsZsdwkhpjZbService;
    @Autowired
-    private SjGfjsYdjcjlMapper sjGfjsYdjcjlMapper;
+    private SjGfjsZsdwwtcjMapper sjGfjsZsdwwtcjMapper;
-//    private SjGfjsZsdwwtcjMapper sjGfjsYdjcjlMapper;
    @Autowired
    private SjGfjsZdgzMapper sjGfjsZdgzMapper;
-//    private SjGfjsZdgzMapper sjGfjsZdgzMapper;
 //    @Autowired
 //    private SjGfjsFjxbzMapper sjGfjsFjxbzMapper;
@@ -89,9 +87,7 @@ public class SjGfjsZsdwkhpjController extends BaseController
    @GetMapping("/listAll")
    public Map<String,Object> listAll(SjGfjsZsdwkhpj sjGfjsZsdwkhpj)
    {
-//        PageDomain pageDomain = TableSupport.buildPageRequest();
-//        Integer pageNum = pageDomain.getPageNum();
-//        Integer pageSize = pageDomain.getPageSize();
        Map<String,Object> map=new HashMap<>();
        Long deptId = sjGfjsZsdwkhpj.getDeptId();
        String nd = sjGfjsZsdwkhpj.getNd();
@@ -107,6 +103,7 @@ public class SjGfjsZsdwkhpjController extends BaseController
        String zqfw = sjGfjsZsdwkhpj.getZqfw();
        String startRq=null;
        String endRq=null;
        if("上半年".equals(zqfw)){
            startRq=nd+"-01";
            endRq=nd+"-06";
@@ -136,6 +133,7 @@ public class SjGfjsZsdwkhpjController extends BaseController
                sjGfjsZsdwkhpjZbnew.setDeptDfl(dept.getDeptDfl());
                sjGfjsZsdwkhpjZbnew.setDeptLx(dept.getDeptLx());
                sjGfjsZsdwkhpjZbnew.setDeptYwfl(dept.getDeptYwfl());
+                sjGfjsZsdwkhpjZbnew.setZt("0");//未提交
                sjGfjsZsdwkhpjZbService.insertSjGfjsZsdwkhpjZb(sjGfjsZsdwkhpjZbnew);
            }
@@ -152,11 +150,11 @@ public class SjGfjsZsdwkhpjController extends BaseController
            sjGfjsZsdwwtcj.setStartRq(startRq);
            sjGfjsZsdwwtcj.setEndRq(endRq);
            sjGfjsZsdwwtcj.setJcjb("直属单位自查");
-            List<SjGfjsZsdwwtcj> sjGfjsZsdwwtcjs = sjGfjsYdjcjlMapper.selectSjGfjsZsdwwtcjList(sjGfjsZsdwwtcj);
+            List<SjGfjsZsdwwtcj> sjGfjsZsdwwtcjs = sjGfjsZsdwwtcjMapper.selectSjGfjsZsdwwtcjList(sjGfjsZsdwwtcj);
            for(int i=0;i<sjGfjsZdgzList.size();i++){
                SjGfjsZdgzCb sjGfjsZdgzCb = sjGfjsZdgzList.get(i);
-                SjGfjsZsdwkhpj zsdwkhpj=new SjGfjsZsdwkhpj();
+                SjGfjsZsdwkhpj zsdwkhpj = new SjGfjsZsdwkhpj();
                zsdwkhpj.setKhnr(sjGfjsZdgzCb.getKhnr());
                zsdwkhpj.setKhxd(sjGfjsZdgzCb.getKhxd());
                zsdwkhpj.setPjbzid(sjGfjsZdgzCb.getId()+"");
@@ -182,14 +180,23 @@ public class SjGfjsZsdwkhpjController extends BaseController
                sjGfjsZsdwkhpjService.batchSave(addList);
            }
        }
        //查询考核评价
        List<SjGfjsZsdwkhpj> resjGfjsZsdwkhpjs = sjGfjsZsdwkhpjService.selectSjGfjsZsdwkhpjList(sjGfjsZsdwkhpj);
+        //查询主表信息
+        SjGfjsZsdwkhpjZb zb_qry = new SjGfjsZsdwkhpjZb();
+        zb_qry.setNd(nd);
+        zb_qry.setDeptId(deptId);
+        zb_qry.setZqfw(sjGfjsZsdwkhpj.getZqfw());
+        SjGfjsZsdwkhpjZb zb =sjGfjsZsdwkhpjZbService.selectSjGfjsZsdwkhpjZb(zb_qry);
+        String zt = zb.getZt();
        map.put("code",HttpStatus.SUCCESS);
        map.put("msg","查询成功");
        map.put("khpjData",resjGfjsZsdwkhpjs);
+        map.put("zt", zt);
        return  map;
    }
@@ -201,6 +208,7 @@ public class SjGfjsZsdwkhpjController extends BaseController
    public void export(HttpServletResponse response, SjGfjsZsdwkhpj sjGfjsZsdwkhpj)
    {
        List<SjGfjsZsdwkhpj> list = sjGfjsZsdwkhpjService.selectSjGfjsZsdwkhpjList(sjGfjsZsdwkhpj);
        Workbook exl = null;
        OutputStream out = null;
        InputStream in  = null;
@@ -214,8 +222,8 @@ public class SjGfjsZsdwkhpjController extends BaseController
            response.setCharacterEncoding("UTF-8");
            response.setHeader("Content-Disposition", "attachment;filename=" + filename);
            response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
            Sheet sheet = exl.getSheet("Sheet1");
-//            sheet.getRow(0).getCell(0).setCellValue(sjGfjsZsdwkhpj.getNd()+"年"+sjGfjsZsdwkhpj.getZqfw()+sjGfjsZsdwkhpj.getDeptName());
            CellStyle cellStyle = exl.createCellStyle();
            cellStyle.setWrapText(true);
            cellStyle.setAlignment(HorizontalAlignment.LEFT);
@@ -228,6 +236,7 @@ public class SjGfjsZsdwkhpjController extends BaseController
            cellStyle.setRightBorderColor(IndexedColors.BLACK.getIndex());
            cellStyle.setBorderTop(BorderStyle.THIN);
            cellStyle.setTopBorderColor(IndexedColors.BLACK.getIndex());
            String deptName="";
            int lastRow = sheet.getLastRowNum()+1;
            for( SjGfjsZsdwkhpj zsdwkhpj:list){
@@ -249,6 +258,7 @@ public class SjGfjsZsdwkhpjController extends BaseController
            mergeCellsByColumn(sheet,0);
            mergeCellsByColumn(sheet,1);
            sheet.getRow(0).getCell(0).setCellValue(sjGfjsZsdwkhpj.getNd()+sjGfjsZsdwkhpj.getZqfw()+deptName+"考核评价");
            exl.write(out);
            exl.close();
        }catch (Exception e){
@@ -359,6 +369,20 @@ public class SjGfjsZsdwkhpjController extends BaseController
    {
        return toAjax(sjGfjsZsdwkhpjService.pledit(list));
    }
+    /**
+     * 修改并提交 规范建设-直属单位考核评价
+     */
+    @Log(title = "修改并提交 规范建设-直属单位考核评价", businessType = BusinessType.UPDATE)
+    @PutMapping("/pleditAndTj")
+    public AjaxResult pleditAndTj(@RequestBody List<SjGfjsZsdwkhpj> list)
+    {
+        sjGfjsZsdwkhpjService.pledit(list);
+        SjGfjsZsdwkhpj sjGfjsZsdwkhpj = list.get(0);
+        SjGfjsZsdwkhpjZb zb = sjGfjsZsdwkhpjZbService.selectSjGfjsZsdwkhpjZbById(sjGfjsZsdwkhpj.getZbId());
+        zb.setZt("1");
+        return toAjax(sjGfjsZsdwkhpjZbService.updateSjGfjsZsdwkhpjZb(zb));
+    }
    @PostMapping("/importData")
@@ -397,13 +421,13 @@ public class SjGfjsZsdwkhpjController extends BaseController
                }
                zsdwkhpj.setZbId(Long.parseLong(zbid));
-                String khnr=new DataFormatter().formatCellValue(row.getCell(1));
+                String khnr=new DataFormatter().formatCellValue(row.getCell(0));
                zsdwkhpj.setKhnr(khnr);
-                String xd=new DataFormatter().formatCellValue(row.getCell(2));
+                String xd=new DataFormatter().formatCellValue(row.getCell(1));
                zsdwkhpj.setKhxd(xd);
-                String pj=new DataFormatter().formatCellValue(row.getCell(3));
+                String pj=new DataFormatter().formatCellValue(row.getCell(2));
                zsdwkhpj.setPjbzmc(pj);
                String sl=new DataFormatter().formatCellValue(row.getCell(3));

--- a/qianhe-ydsj/src/main/java/com/qianhe/controller/SjGfjsZsdwwtcjController.java
+++ b/qianhe-ydsj/src/main/java/com/qianhe/controller/SjGfjsZsdwwtcjController.java
+package com.qianhe.controller;
+import com.qianhe.common.annotation.Log;
+import com.qianhe.common.core.controller.BaseController;
+import com.qianhe.common.core.domain.AjaxResult;
+import com.qianhe.common.core.domain.entity.SysDept;
+import com.qianhe.common.core.page.TableDataInfo;
+import com.qianhe.common.enums.BusinessType;
+import com.qianhe.common.exception.BusinessException;
+import com.qianhe.common.utils.DateUtils;
+import com.qianhe.common.utils.SecurityUtils;
+import com.qianhe.common.utils.StringUtils;
+import com.qianhe.domain.SjGfjsZdgzCb;
+import com.qianhe.domain.SjGfjsZsdwfjxcj;
+import com.qianhe.domain.SjGfjsZsdwwtcj;
+import com.qianhe.mapper.SjGfjsZdgzMapper;
+import com.qianhe.service.ISjGfjsZsdwwtcjService;
+import com.qianhe.system.mapper.SysDeptMapper;
+import org.apache.poi.ss.usermodel.DataFormatter;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.usermodel.WorkbookFactory;
+import org.apache.poi.xssf.usermodel.XSSFRow;
+import org.apache.poi.xssf.usermodel.XSSFSheet;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+/**
+ * 规范建设-直属单位问题采集Controller
+ *
+ * @author qianhe
+ * @date 2024-07-23
+ */
+@RestController
+@RequestMapping("/system/sjGfjsZsdwwtcj")
+public class SjGfjsZsdwwtcjController extends BaseController
+{
+    @Autowired
+    private ISjGfjsZsdwwtcjService sjGfjsZsdwwtcjService;
+    @Autowired
+    private SysDeptMapper sysDeptMapper;
+    @Autowired
+    private SjGfjsZdgzMapper sjGfjsZdgzMapper;
+    /**
+     * 查询规范建设-直属单位问题采集列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(SjGfjsZsdwwtcj sjGfjsZsdwwtcj)
+    {
+        sjGfjsZsdwwtcj.setJcjb("直属单位自查");
+        startPage();
+        List<SjGfjsZsdwwtcj> list = sjGfjsZsdwwtcjService.selectSjGfjsZsdwwtcjList(sjGfjsZsdwwtcj);
+        return getDataTable(list);
+    }
+    /**
+     * 导出规范建设-直属单位问题采集列表
+     */
+    @Log(title = "规范建设-直属单位问题采集", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SjGfjsZsdwwtcj sjGfjsZsdwwtcj)
+    {
+        Workbook exl = null;
+        OutputStream out = null;
+        InputStream in  = null;
+        try {
+            in =this.getClass().getResourceAsStream("/static/gfjs_zsdwwtcj_db.xlsx");
+            exl = WorkbookFactory.create(in);
+            out = response.getOutputStream();
+            response.reset();
+            String filename = URLEncoder.encode("直属单位问题采集模板.xlsx", "UTF-8");
+            response.setCharacterEncoding("UTF-8");
+            response.setHeader("Content-Disposition", "attachment;filename=" + filename);
+            response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
+            exl.write(out);
+            exl.close();
+        }catch(Exception e){
+            e.getMessage();
+            throw new BusinessException("导出Excel失败，请联系网站管理员！");
+        }finally{
+            if (exl != null) {
+                try {
+                    exl.close();
+                } catch (IOException e1) {
+                    e1.printStackTrace();
+                }
+            }
+            if (out != null) {
+                try {
+                    out.close();
+                } catch (IOException e1) {
+                    e1.printStackTrace();
+                }
+            }
+        }
+    }
+    /**
+     * 获取规范建设-直属单位问题采集详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(sjGfjsZsdwwtcjService.selectSjGfjsZsdwwtcjById(id));
+    }
+    /**
+     * 新增规范建设-直属单位问题采集
+     */
+    @Log(title = "规范建设-直属单位问题采集", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SjGfjsZsdwwtcj sjGfjsZsdwwtcj)
+    {
+        sjGfjsZsdwwtcj.setJcjb("直属单位自查");
+        SysDept dept = sysDeptMapper.selectDeptById(sjGfjsZsdwwtcj.getDeptId());
+        sjGfjsZsdwwtcj.setYl3(dept.getParentId());
+        return toAjax(sjGfjsZsdwwtcjService.insertSjGfjsZsdwwtcj(sjGfjsZsdwwtcj));
+    }
+    /**
+     * 修改规范建设-直属单位问题采集
+     */
+    @Log(title = "规范建设-直属单位问题采集", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SjGfjsZsdwwtcj sjGfjsZsdwwtcj)
+    {
+        sjGfjsZsdwwtcj.setJcjb("直属单位自查");
+        SysDept dept = sysDeptMapper.selectDeptById(sjGfjsZsdwwtcj.getDeptId());
+        sjGfjsZsdwwtcj.setYl3(dept.getParentId());
+        return toAjax(sjGfjsZsdwwtcjService.updateSjGfjsZsdwwtcj(sjGfjsZsdwwtcj));
+    }
+    /**
+     * 删除规范建设-直属单位问题采集
+     */
+    @Log(title = "规范建设-直属单位问题采集", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(sjGfjsZsdwwtcjService.deleteSjGfjsZsdwwtcjByIds(ids));
+    }
+    @PostMapping("/importData")
+    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception{
+        XSSFWorkbook workbook = null;
+        List<SysDept> deptList = sysDeptMapper.selectDeptList(new SysDept());
+        try {
+            //装载流
+            workbook = new XSSFWorkbook(file.getInputStream());
+            // 获取一个工作表，下标从0开始
+            XSSFSheet sheet = workbook.getSheetAt(0);
+            int lastRowNum = sheet.getLastRowNum();
+            List<SjGfjsZsdwwtcj> list=new ArrayList<>();
+            // 通过循环，逐行取出表中每行数据
+            for(int i=0;i<=lastRowNum;i++) {//跳过第一行和第二行
+                if(i==0 || i==1){
+                    continue;
+                }
+                // 获取行
+                XSSFRow row = sheet.getRow(i);
+                SjGfjsZsdwwtcj zsdwwtcj=new SjGfjsZsdwwtcj();
+                System.out.println(row);
+                //日期
+                String rq=new DataFormatter().formatCellValue(row.getCell(1));
+                if(StringUtils.isEmpty(rq)){
+                    return AjaxResult.error("导入失败，第"+(i+1)+"行日期不能为空");
+                }
+                Date date = DateUtils.parseDate(rq);
+                if(date==null){
+                    return AjaxResult.error("导入失败，第"+(i+1)+"行日期格式错误");
+                }
+                zsdwwtcj.setRq(DateUtils.parseDateToStr("yyyy-MM",date));
+                //单位
+                String dw=new DataFormatter().formatCellValue(row.getCell(2)) ;
+                if(StringUtils.isEmpty(dw)){
+                    return AjaxResult.error("导入失败，第"+(i+1)+"行单位不能为空");
+                }
+                //查询单位id
+                String[] split = dw.split("/");
+                if(split.length<2){
+                    return AjaxResult.error("导入失败，第"+(i+1)+"行输入的单位格式有误!");
+                }
+                String ejdw=split[0];
+                SysDept ejdept = deptList.stream().filter(dept -> dept.getDeptName().equals(ejdw)).findFirst().orElse(null);
+                if(ejdept==null){
+                    return AjaxResult.error("导入失败，第"+(i+1)+"行未匹配到二级单位");
+                }
+                zsdwwtcj.setYl3(ejdept.getDeptId());
+                String sjdw=split[1];
+                SysDept sjdept = deptList.stream().filter(dept -> dept.getDeptName().equals(sjdw) && dept.getParentId().equals(ejdept.getDeptId())).findFirst().orElse(null);
+                if(sjdept==null){
+                    return AjaxResult.error("导入失败，第"+(i+1)+"行未匹配到三级单位");
+                }
+                zsdwwtcj.setDeptId(sjdept.getDeptId());
+                //问题描述
+                String wtms=new DataFormatter().formatCellValue(row.getCell(3)) ;
+                if(StringUtils.isEmpty(wtms)){
+                    return AjaxResult.error("导入失败，第"+(i+1)+"行问题描述不能为空");
+                }
+                zsdwwtcj.setWtmc(wtms);
+                //考核内容
+                String khnr=new DataFormatter().formatCellValue(row.getCell(4)) ;
+                if(StringUtils.isEmpty(khnr)){
+                    return AjaxResult.error("导入失败，第"+(i+1)+"行实施路径不能为空");
+                }
+                zsdwwtcj.setKhnr(khnr);
+                //考核项点
+                String khxd=new DataFormatter().formatCellValue(row.getCell(5)) ;
+                if(StringUtils.isEmpty(khxd)){
+                    return AjaxResult.error("导入失败，第"+(i+1)+"行重点工作不能为空");
+                }
+                zsdwwtcj.setKhxd(khxd);
+                String pjbz=new DataFormatter().formatCellValue(row.getCell(6)) ;
+                if(StringUtils.isEmpty(pjbz)){
+                    return AjaxResult.error("导入失败，第"+(i+1)+"行主要工作要求不能为空");
+                }
+                //匹配评价标准
+                String substring = pjbz.substring(6);
+                long l = Long.parseLong(substring);
+                SjGfjsZdgzCb sjGfjsZdgzCb=new SjGfjsZdgzCb();
+                sjGfjsZdgzCb.setKhxd(khxd);
+                sjGfjsZdgzCb.setKhnr(khnr);
+                sjGfjsZdgzCb.setPx(l);
+                sjGfjsZdgzCb.setNd(rq.substring(0,4));
+                SjGfjsZdgzCb cb=sjGfjsZdgzMapper.selectSjGfjsZdgzCb(sjGfjsZdgzCb);
+                if(cb==null){
+                    return AjaxResult.error("导入失败，第"+(i+1)+"行未匹配到主要工作要求");
+                }
+                zsdwwtcj.setPjbzid(cb.getId()+"");
+                zsdwwtcj.setPjbzmc(cb.getPjbz());
+                String zgzrr=new DataFormatter().formatCellValue(row.getCell(7)) ;
+                zsdwwtcj.setZgzrr(zgzrr);
+                String zgcs=new DataFormatter().formatCellValue(row.getCell(8)) ;
+                zsdwwtcj.setZgcs(zgcs);
+                String zgqx=new DataFormatter().formatCellValue(row.getCell(9)) ;
+                zsdwwtcj.setZgqx(zgqx);
+                String zgzt=new DataFormatter().formatCellValue(row.getCell(10)) ;
+                zsdwwtcj.setZgzt(zgzt);
+                zsdwwtcj.setJcjb("直属单位自查");
+                zsdwwtcj.setCreateTime(DateUtils.getNowDate());
+                zsdwwtcj.setCreateBy(SecurityUtils.getUsername());
+                list.add(zsdwwtcj);
+            }
+            if(list.size()>0){
+                sjGfjsZsdwwtcjService.batchSave(list);
+            }
+        } catch (IOException e) {
+            e.getMessage();
+            e.printStackTrace();
+            throw new BusinessException("导入Excel失败，请联系网站管理员！");
+        } finally {
+            workbook.close();
+        }
+        return AjaxResult.success("导入成功");
+    }
+    //批量提交 ids
+    @Log(title = "批量提交 直属单位自查", businessType = BusinessType.UPDATE)
+    @PostMapping("/pltj")
+    public AjaxResult pltj(SjGfjsZsdwwtcj fjx)
+    {
+        fjx.setZt("1");
+        return toAjax(sjGfjsZsdwwtcjService.plxg(fjx));
+    }
+}
--- a/qianhe-ydsj/src/main/java/com/qianhe/domain/SjGfjsYdjcjl.java
+++ b/qianhe-ydsj/src/main/java/com/qianhe/domain/SjGfjsYdjcjl.java
@@ -53,6 +53,10 @@ public class SjGfjsYdjcjl extends BaseEntity
    @Excel(name = "是否存在问题")
    private String sfczwt;
+    /** 状态 0 未提交 1 已提交 */
+    @Excel(name = "状态 0 未提交 1 已提交")
+    private String zt;
    /** 规范建设 月度检查记录 问题从信息 */
    private List<SjGfjsZsdwwtcj> sjGfjsZsdwwtcjList;
@@ -65,4 +69,6 @@ public class SjGfjsYdjcjl extends BaseEntity
    private String deptLx;
    private String yl3name;
    private String nd;
+    private String wtzs;//查询结果 问题总数
+    private String yzgsl;//查询结果 已整改数量
 }
--- a/qianhe-ydsj/src/main/java/com/qianhe/domain/SjGfjsZsdwfjxcj.java
+++ b/qianhe-ydsj/src/main/java/com/qianhe/domain/SjGfjsZsdwfjxcj.java
@@ -62,6 +62,10 @@ public class SjGfjsZsdwfjxcj extends BaseEntity
    @Excel(name = "预留5")
    private String yl5;
+    /** 状态 0 未提交 1 已提交 */
+    @Excel(name = "状态")
+    private String zt;
    private String deptName;
@@ -72,5 +76,7 @@ public class SjGfjsZsdwfjxcj extends BaseEntity
    private String yl3name;
+    private String ids;//批量的ids
 }
--- a/qianhe-ydsj/src/main/java/com/qianhe/domain/SjGfjsZsdwkhpj.java
+++ b/qianhe-ydsj/src/main/java/com/qianhe/domain/SjGfjsZsdwkhpj.java
@@ -36,17 +36,17 @@ public class SjGfjsZsdwkhpj extends BaseEntity
    private String jb;
    /** 考核内容 */
-    @Excel(name = "考核内容",needMerge=true)
+    @Excel(name = "实施路径",needMerge=true)
    private String khnr;
    /** 考核项点 */
-    @Excel(name = "考核项点",needMerge=true)
+    @Excel(name = "重点工作",needMerge=true)
    private String khxd;
    /** 评价标准名称 */
-    @Excel(name = "评价标准")
+    @Excel(name = "主要工作要求")
    private String pjbzmc;
    /** 数量 */

--- a/qianhe-ydsj/src/main/java/com/qianhe/domain/SjGfjsZsdwkhpjZb.java
+++ b/qianhe-ydsj/src/main/java/com/qianhe/domain/SjGfjsZsdwkhpjZb.java
@@ -184,5 +184,9 @@ public class SjGfjsZsdwkhpjZb extends BaseEntity
     * 排名
     */
    private String pm;
+    /**
+     * 状态 0 未提交 1 已提交
+     */
+    private String zt;
 }
--- a/qianhe-ydsj/src/main/java/com/qianhe/domain/SjGfjsZsdwwtcj.java
+++ b/qianhe-ydsj/src/main/java/com/qianhe/domain/SjGfjsZsdwwtcj.java
@@ -44,7 +44,7 @@ public class SjGfjsZsdwwtcj extends BaseEntity
    private String pjbzid;
    /** 评价标准名称 */
-    @Excel(name = "主要工作内容")
+    @Excel(name = "主要工作要求")
    private String pjbzmc;
    /** 整改责任人 */
@@ -88,6 +88,10 @@ public class SjGfjsZsdwwtcj extends BaseEntity
    @Excel(name = "主表月度检查记录表id")
    private Long pid;
+    /** 状态 0 未提交 1 已提交 */
+    @Excel(name = "状态")
+    private String zt;
    private String deptName;
@@ -97,4 +101,7 @@ public class SjGfjsZsdwwtcj extends BaseEntity
    private String deptLx;
    private String yl3name;
    private String nd;
+    private String ids;//批量ids
 }
--- a/qianhe-ydsj/src/main/java/com/qianhe/mapper/SjGfjsJcdwkhpjZbMapper.java
+++ b/qianhe-ydsj/src/main/java/com/qianhe/mapper/SjGfjsJcdwkhpjZbMapper.java
-package com.qianhe.mapper;
-import com.qianhe.domain.SjGfjsZsdwkhpjZb;
-import java.util.List;
-/**
- * 规范建设-基层单位考核评价主Mapper接口
- *
- * @author qianhe
- * @date 2024-07-24
- */
-public interface SjGfjsJcdwkhpjZbMapper
-{
-    /**
-     * 查询规范建设-基层单位考核评价主
-     *
-     * @param id 规范建设-基层单位考核评价主主键
-     * @return 规范建设-基层单位考核评价主
-     */
-    public SjGfjsZsdwkhpjZb selectSjGfjsZsdwkhpjZbById(Long id);
-    /**
-     * 查询规范建设-基层单位考核评价主列表
-     *
-     * @param sjGfjsZsdwkhpjZb 规范建设-基层单位考核评价主
-     * @return 规范建设-基层单位考核评价主集合
-     */
-    public List<SjGfjsZsdwkhpjZb> selectSjGfjsZsdwkhpjZbList(SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZb);
-    /**
-     * 新增规范建设-基层单位考核评价主
-     *
-     * @param sjGfjsZsdwkhpjZb 规范建设-基层单位考核评价主
-     * @return 结果
-     */
-    public int insertSjGfjsZsdwkhpjZb(SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZb);
-    /**
-     * 修改规范建设-基层单位考核评价主
-     *
-     * @param sjGfjsZsdwkhpjZb 规范建设-基层单位考核评价主
-     * @return 结果
-     */
-    public int updateSjGfjsZsdwkhpjZb(SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZb);
-    /**
-     * 删除规范建设-基层单位考核评价主
-     *
-     * @param id 规范建设-基层单位考核评价主主键
-     * @return 结果
-     */
-    public int deleteSjGfjsZsdwkhpjZbById(Long id);
-    /**
-     * 批量删除规范建设-基层单位考核评价主
-     *
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteSjGfjsZsdwkhpjZbByIds(Long[] ids);
-    SjGfjsZsdwkhpjZb selectSjGfjsZsdwkhpjZb(SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZb);
-}
--- a/qianhe-ydsj/src/main/java/com/qianhe/mapper/SjGfjsZsdwfjxcjMapper.java
+++ b/qianhe-ydsj/src/main/java/com/qianhe/mapper/SjGfjsZsdwfjxcjMapper.java
@@ -62,6 +62,7 @@ public interface SjGfjsZsdwfjxcjMapper
    int batchSave(List<SjGfjsZsdwfjxcj> list);
+    int plxg(SjGfjsZsdwfjxcj sjGfjsZsdwfjxcj);
 }
--- a/qianhe-ydsj/src/main/java/com/qianhe/mapper/SjGfjsZsdwwtcjMapper.java
+++ b/qianhe-ydsj/src/main/java/com/qianhe/mapper/SjGfjsZsdwwtcjMapper.java
+package com.qianhe.mapper;
+import com.qianhe.domain.SjGfjsZsdwwtcj;
+import java.util.List;
+/**
+ * 规范建设-直属单位问题采集Mapper接口
+ * 
+ * @author qianhe
+ * @date 2024-07-23
+ */
+public interface SjGfjsZsdwwtcjMapper 
+{
+    /**
+     * 查询规范建设-直属单位问题采集
+     * 
+     * @param id 规范建设-直属单位问题采集主键
+     * @return 规范建设-直属单位问题采集
+     */
+    public SjGfjsZsdwwtcj selectSjGfjsZsdwwtcjById(Long id);
+    /**
+     * 查询规范建设-直属单位问题采集列表
+     * 
+     * @param sjGfjsZsdwwtcj 规范建设-直属单位问题采集
+     * @return 规范建设-直属单位问题采集集合
+     */
+    public List<SjGfjsZsdwwtcj> selectSjGfjsZsdwwtcjList(SjGfjsZsdwwtcj sjGfjsZsdwwtcj);
+    /**
+     * 新增规范建设-直属单位问题采集
+     * 
+     * @param sjGfjsZsdwwtcj 规范建设-直属单位问题采集
+     * @return 结果
+     */
+    public int insertSjGfjsZsdwwtcj(SjGfjsZsdwwtcj sjGfjsZsdwwtcj);
+    /**
+     * 修改规范建设-直属单位问题采集
+     * 
+     * @param sjGfjsZsdwwtcj 规范建设-直属单位问题采集
+     * @return 结果
+     */
+    public int updateSjGfjsZsdwwtcj(SjGfjsZsdwwtcj sjGfjsZsdwwtcj);
+    public int plxg(SjGfjsZsdwwtcj sjGfjsZsdwwtcj);
+    /**
+     * 删除规范建设-直属单位问题采集
+     * 
+     * @param id 规范建设-直属单位问题采集主键
+     * @return 结果
+     */
+    public int deleteSjGfjsZsdwwtcjById(Long id);
+    /**
+     * 批量删除规范建设-直属单位问题采集
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSjGfjsZsdwwtcjByIds(Long[] ids);
+    int batchSave(List<SjGfjsZsdwwtcj> list);
+}
--- a/qianhe-ydsj/src/main/java/com/qianhe/service/ISjGfjsYdjcjlService.java
+++ b/qianhe-ydsj/src/main/java/com/qianhe/service/ISjGfjsYdjcjlService.java
@@ -43,6 +43,7 @@ public interface ISjGfjsYdjcjlService
     * @return 结果
     */
    public int updateSjGfjsYdjcjl(SjGfjsYdjcjl sjGfjsYdjcjl);
+    public int tjSjGfjsYdjcjl(SjGfjsYdjcjl sjGfjsYdjcjl);//月度检查记录提交
    /**
     * 批量删除指导帮扶-基层单位问题采集

--- a/qianhe-ydsj/src/main/java/com/qianhe/service/ISjGfjsZsdwfjxcjService.java
+++ b/qianhe-ydsj/src/main/java/com/qianhe/service/ISjGfjsZsdwfjxcjService.java
@@ -62,4 +62,5 @@ public interface ISjGfjsZsdwfjxcjService
    int batchSave(List<SjGfjsZsdwfjxcj> list);
+    public int plxg(SjGfjsZsdwfjxcj sjGfjsZsdwfjxcj);
 }
--- a/qianhe-ydsj/src/main/java/com/qianhe/service/ISjGfjsZsdwwtcjService.java
+++ b/qianhe-ydsj/src/main/java/com/qianhe/service/ISjGfjsZsdwwtcjService.java
+package com.qianhe.service;
+import com.qianhe.domain.SjGfjsZsdwwtcj;
+import java.util.List;
+/**
+ * 规范建设-直属单位问题采集Service接口
+ * 
+ * @author qianhe
+ * @date 2024-07-23
+ */
+public interface ISjGfjsZsdwwtcjService 
+{
+    /**
+     * 查询规范建设-直属单位问题采集
+     * 
+     * @param id 规范建设-直属单位问题采集主键
+     * @return 规范建设-直属单位问题采集
+     */
+    public SjGfjsZsdwwtcj selectSjGfjsZsdwwtcjById(Long id);
+    /**
+     * 查询规范建设-直属单位问题采集列表
+     * 
+     * @param sjGfjsZsdwwtcj 规范建设-直属单位问题采集
+     * @return 规范建设-直属单位问题采集集合
+     */
+    public List<SjGfjsZsdwwtcj> selectSjGfjsZsdwwtcjList(SjGfjsZsdwwtcj sjGfjsZsdwwtcj);
+    /**
+     * 新增规范建设-直属单位问题采集
+     * 
+     * @param sjGfjsZsdwwtcj 规范建设-直属单位问题采集
+     * @return 结果
+     */
+    public int insertSjGfjsZsdwwtcj(SjGfjsZsdwwtcj sjGfjsZsdwwtcj);
+    /**
+     * 修改规范建设-直属单位问题采集
+     * 
+     * @param sjGfjsZsdwwtcj 规范建设-直属单位问题采集
+     * @return 结果
+     */
+    public int updateSjGfjsZsdwwtcj(SjGfjsZsdwwtcj sjGfjsZsdwwtcj);
+    public int plxg(SjGfjsZsdwwtcj sjGfjsZsdwwtcj);
+    /**
+     * 批量删除规范建设-直属单位问题采集
+     * 
+     * @param ids 需要删除的规范建设-直属单位问题采集主键集合
+     * @return 结果
+     */
+    public int deleteSjGfjsZsdwwtcjByIds(Long[] ids);
+    /**
+     * 删除规范建设-直属单位问题采集信息
+     * 
+     * @param id 规范建设-直属单位问题采集主键
+     * @return 结果
+     */
+    public int deleteSjGfjsZsdwwtcjById(Long id);
+    int batchSave(List<SjGfjsZsdwwtcj> list);
+}
--- a/qianhe-ydsj/src/main/java/com/qianhe/service/impl/SjGfjsJcdwkhpjZbServiceImpl.java
+++ b/qianhe-ydsj/src/main/java/com/qianhe/service/impl/SjGfjsJcdwkhpjZbServiceImpl.java
@@ -2,8 +2,9 @@ package com.qianhe.service.impl;
 import com.qianhe.common.annotation.DataScope;
 import com.qianhe.common.utils.DateUtils;
+import com.qianhe.common.utils.SecurityUtils;
 import com.qianhe.domain.SjGfjsZsdwkhpjZb;
-import com.qianhe.mapper.SjGfjsJcdwkhpjZbMapper;
+import com.qianhe.mapper.SjGfjsZsdwkhpjZbMapper;
 import com.qianhe.service.ISjGfjsJcdwkhpjZbService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -20,7 +21,7 @@ import java.util.List;
 public class SjGfjsJcdwkhpjZbServiceImpl implements ISjGfjsJcdwkhpjZbService
 {
    @Autowired
-    private SjGfjsJcdwkhpjZbMapper sjGfjsZsdwkhpjZbMapper;
+    private SjGfjsZsdwkhpjZbMapper sjGfjsZsdwkhpjZbMapper;
    /**
     * 查询规范建设-基层单位考核评价主
@@ -56,6 +57,7 @@ public class SjGfjsJcdwkhpjZbServiceImpl implements ISjGfjsJcdwkhpjZbService
    @Override
    public int insertSjGfjsZsdwkhpjZb(SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZb)
    {
+        sjGfjsZsdwkhpjZb.setCreateBy(SecurityUtils.getUsername());
        sjGfjsZsdwkhpjZb.setCreateTime(DateUtils.getNowDate());
        return sjGfjsZsdwkhpjZbMapper.insertSjGfjsZsdwkhpjZb(sjGfjsZsdwkhpjZb);
    }
@@ -69,6 +71,7 @@ public class SjGfjsJcdwkhpjZbServiceImpl implements ISjGfjsJcdwkhpjZbService
    @Override
    public int updateSjGfjsZsdwkhpjZb(SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZb)
    {
+        sjGfjsZsdwkhpjZb.setUpdateBy(SecurityUtils.getUsername());
        sjGfjsZsdwkhpjZb.setUpdateTime(DateUtils.getNowDate());
        return sjGfjsZsdwkhpjZbMapper.updateSjGfjsZsdwkhpjZb(sjGfjsZsdwkhpjZb);
    }

--- a/qianhe-ydsj/src/main/java/com/qianhe/service/impl/SjGfjsYdjcjlServiceImpl.java
+++ b/qianhe-ydsj/src/main/java/com/qianhe/service/impl/SjGfjsYdjcjlServiceImpl.java
@@ -102,6 +102,18 @@ public class SjGfjsYdjcjlServiceImpl implements ISjGfjsYdjcjlService
        return sjGfjsYdjcjlMapper.updateSjGfjsYdjcjl(sjGfjsYdjcjl);
    }
+    //月度检查记录提交
+    @Override
+    @Transactional
+    public int tjSjGfjsYdjcjl(SjGfjsYdjcjl ydjl)
+    {
+        SjGfjsYdjcjl upd = new SjGfjsYdjcjl();
+        upd.setId(ydjl.getId());
+        upd.setUpdateTime(DateUtils.getNowDate());
+        upd.setUpdateBy(SecurityUtils.getUsername());
+        upd.setZt("1");//已提交
+        return sjGfjsYdjcjlMapper.updateSjGfjsYdjcjl(upd);
+    }
    /**
     * 批量删除规范建设 月度检查记录

--- a/qianhe-ydsj/src/main/java/com/qianhe/service/impl/SjGfjsZsdwfjxcjServiceImpl.java
+++ b/qianhe-ydsj/src/main/java/com/qianhe/service/impl/SjGfjsZsdwfjxcjServiceImpl.java
@@ -104,4 +104,13 @@ public class SjGfjsZsdwfjxcjServiceImpl implements ISjGfjsZsdwfjxcjService
    public int batchSave(List<SjGfjsZsdwfjxcj> list) {
        return sjGfjsZsdwfjxcjMapper.batchSave(list);
    }
+    //批量修改 根据ids
+    @Override
+    public int plxg(SjGfjsZsdwfjxcj fjx) {
+        fjx.setUpdateTime(DateUtils.getNowDate());
+        fjx.setUpdateBy(SecurityUtils.getUsername());
+        return sjGfjsZsdwfjxcjMapper.plxg(fjx);
+    }
 }
--- a/qianhe-ydsj/src/main/java/com/qianhe/service/impl/SjGfjsZsdwkhpjZbServiceImpl.java
+++ b/qianhe-ydsj/src/main/java/com/qianhe/service/impl/SjGfjsZsdwkhpjZbServiceImpl.java
@@ -2,6 +2,7 @@ package com.qianhe.service.impl;
 import com.qianhe.common.annotation.DataScope;
 import com.qianhe.common.utils.DateUtils;
+import com.qianhe.common.utils.SecurityUtils;
 import com.qianhe.domain.SjGfjsZsdwkhpjZb;
 import com.qianhe.mapper.SjGfjsZsdwkhpjZbMapper;
 import com.qianhe.service.ISjGfjsZsdwkhpjZbService;
@@ -56,6 +57,7 @@ public class SjGfjsZsdwkhpjZbServiceImpl implements ISjGfjsZsdwkhpjZbService
    @Override
    public int insertSjGfjsZsdwkhpjZb(SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZb)
    {
+        sjGfjsZsdwkhpjZb.setCreateBy(SecurityUtils.getUsername());
        sjGfjsZsdwkhpjZb.setCreateTime(DateUtils.getNowDate());
        return sjGfjsZsdwkhpjZbMapper.insertSjGfjsZsdwkhpjZb(sjGfjsZsdwkhpjZb);
    }
@@ -69,6 +71,7 @@ public class SjGfjsZsdwkhpjZbServiceImpl implements ISjGfjsZsdwkhpjZbService
    @Override
    public int updateSjGfjsZsdwkhpjZb(SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZb)
    {
+        sjGfjsZsdwkhpjZb.setUpdateBy(SecurityUtils.getUsername());
        sjGfjsZsdwkhpjZb.setUpdateTime(DateUtils.getNowDate());
        return sjGfjsZsdwkhpjZbMapper.updateSjGfjsZsdwkhpjZb(sjGfjsZsdwkhpjZb);
    }

--- a/qianhe-ydsj/src/main/java/com/qianhe/service/impl/SjGfjsZsdwwtcjServiceImpl.java
+++ b/qianhe-ydsj/src/main/java/com/qianhe/service/impl/SjGfjsZsdwwtcjServiceImpl.java
+package com.qianhe.service.impl;
+import com.qianhe.common.annotation.DataScope;
+import com.qianhe.common.utils.DateUtils;
+import com.qianhe.common.utils.SecurityUtils;
+import com.qianhe.domain.SjGfjsZsdwwtcj;
+import com.qianhe.mapper.SjGfjsZsdwwtcjMapper;
+import com.qianhe.service.ISjGfjsZsdwwtcjService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.List;
+/**
+ * 规范建设-直属单位问题采集Service业务层处理
+ *
+ * @author qianhe
+ * @date 2024-07-23
+ */
+@Service
+public class SjGfjsZsdwwtcjServiceImpl implements ISjGfjsZsdwwtcjService
+{
+    @Autowired
+    private SjGfjsZsdwwtcjMapper sjGfjsZsdwwtcjMapper;
+    /**
+     * 查询规范建设-直属单位问题采集
+     *
+     * @param id 规范建设-直属单位问题采集主键
+     * @return 规范建设-直属单位问题采集
+     */
+    @Override
+    public SjGfjsZsdwwtcj selectSjGfjsZsdwwtcjById(Long id)
+    {
+        SjGfjsZsdwwtcj zsdwwtcj = sjGfjsZsdwwtcjMapper.selectSjGfjsZsdwwtcjById(id);
+        return zsdwwtcj;
+    }
+    /**
+     * 查询规范建设-直属单位问题采集列表
+     *
+     * @param sjGfjsZsdwwtcj 规范建设-直属单位问题采集
+     * @return 规范建设-直属单位问题采集
+     */
+    @Override
+    @DataScope(deptAlias = "d")
+    public List<SjGfjsZsdwwtcj> selectSjGfjsZsdwwtcjList(SjGfjsZsdwwtcj sjGfjsZsdwwtcj)
+    {
+        sjGfjsZsdwwtcj.setJcjb("直属单位自查");
+        return sjGfjsZsdwwtcjMapper.selectSjGfjsZsdwwtcjList(sjGfjsZsdwwtcj);
+    }
+    /**
+     * 新增规范建设-直属单位问题采集
+     *
+     * @param sjGfjsZsdwwtcj 规范建设-直属单位问题采集
+     * @return 结果
+     */
+    @Override
+    public int insertSjGfjsZsdwwtcj(SjGfjsZsdwwtcj sjGfjsZsdwwtcj)
+    {
+        sjGfjsZsdwwtcj.setCreateTime(DateUtils.getNowDate());
+        sjGfjsZsdwwtcj.setCreateBy(SecurityUtils.getUsername());
+        return sjGfjsZsdwwtcjMapper.insertSjGfjsZsdwwtcj(sjGfjsZsdwwtcj);
+    }
+    /**
+     * 修改规范建设-直属单位问题采集
+     *
+     * @param sjGfjsZsdwwtcj 规范建设-直属单位问题采集
+     * @return 结果
+     */
+    @Override
+    public int updateSjGfjsZsdwwtcj(SjGfjsZsdwwtcj sjGfjsZsdwwtcj)
+    {
+        sjGfjsZsdwwtcj.setUpdateTime(DateUtils.getNowDate());
+        sjGfjsZsdwwtcj.setUpdateBy(SecurityUtils.getUsername());
+        return sjGfjsZsdwwtcjMapper.updateSjGfjsZsdwwtcj(sjGfjsZsdwwtcj);
+    }
+    @Override
+    public int plxg(SjGfjsZsdwwtcj sjGfjsZsdwwtcj)
+    {
+        sjGfjsZsdwwtcj.setUpdateTime(DateUtils.getNowDate());
+        sjGfjsZsdwwtcj.setUpdateBy(SecurityUtils.getUsername());
+        return sjGfjsZsdwwtcjMapper.plxg(sjGfjsZsdwwtcj);
+    }
+    /**
+     * 批量删除规范建设-直属单位问题采集
+     *
+     * @param ids 需要删除的规范建设-直属单位问题采集主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSjGfjsZsdwwtcjByIds(Long[] ids)
+    {
+        return sjGfjsZsdwwtcjMapper.deleteSjGfjsZsdwwtcjByIds(ids);
+    }
+    /**
+     * 删除规范建设-直属单位问题采集信息
+     *
+     * @param id 规范建设-直属单位问题采集主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSjGfjsZsdwwtcjById(Long id)
+    {
+        return sjGfjsZsdwwtcjMapper.deleteSjGfjsZsdwwtcjById(id);
+    }
+    @Override
+    public int batchSave(List<SjGfjsZsdwwtcj> list) {
+        return sjGfjsZsdwwtcjMapper.batchSave(list);
+    }
+}
--- a/qianhe-ydsj/src/main/resources/mapper/SjGfjsJcdwkhpjZbMapper.xml
+++ b/qianhe-ydsj/src/main/resources/mapper/SjGfjsJcdwkhpjZbMapper.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.SjGfjsJcdwkhpjZbMapper">
-    <resultMap type="SjGfjsZsdwkhpjZb" id="SjGfjsZsdwkhpjZbResult">
-        <result property="id"    column="id"    />
-        <result property="deptId"    column="dept_id"    />
-        <result property="parentDeptId"    column="parent_dept_id"    />
-        <result property="nd"    column="nd"    />
-        <result property="zqfw"    column="zqfw"    />
-        <result property="zqlx"    column="zqlx"    />
-        <result property="jb"    column="jb"    />
-        <result property="deptDfl"    column="dept_dfl"    />
-        <result property="deptLx"    column="dept_lx"    />
-        <result property="deptYwfl"    column="dept_ywfl"    />
-        <result property="djyjzfs"    column="djyjzfs"    />
-        <result property="djyjkfs"    column="djyjkfs"    />
-        <result property="djyjkfbl"    column="djyjkfbl"    />
-        <result property="djyjdf"    column="djyjdf"    />
-        <result property="sztszfs"    column="sztszfs"    />
-        <result property="sztskfs"    column="sztskfs"    />
-        <result property="sztsfbl"    column="sztsfbl"    />
-        <result property="sztsdf"    column="sztsdf"    />
-        <result property="glgfzfs"    column="glgfzfs"    />
-        <result property="glgfkfs"    column="glgfkfs"    />
-        <result property="glgfbl"    column="glgfbl"    />
-        <result property="glgfdf"    column="glgfdf"    />
-        <result property="ywcxzfs"    column="ywcxzfs"    />
-        <result property="ywcxkfs"    column="ywcxkfs"    />
-        <result property="ywcxbl"    column="ywcxbl"    />
-        <result property="ywcxdf"    column="ywcxdf"    />
-        <result property="sffjxs"    column="sffjxs"    />
-        <result property="zkf"    column="zkf"    />
-        <result property="zkfbl"    column="zkfbl"    />
-        <result property="zdf"    column="zdf"    />
-        <result property="zhdf"    column="zhdf"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
-        <result property="yl1"    column="yl1"    />
-        <result property="yl2"    column="yl2"    />
-        <result property="yl3"    column="yl3"    />
-        <result property="yl4"    column="yl4"    />
-        <result property="yl5"    column="yl5"    />
-        <result property="deptName"    column="dept_name"    />
-        <result property="parentName"    column="parent_name"    />
-    </resultMap>
-    <sql id="selectSjGfjsZsdwkhpjZbVo">
-        select id,
-               a.dept_id,
-               parent_dept_id,
-               nd,
-               zqfw,
-               zqlx,
-               jb,
-               d.dept_dfl,
-               d.dept_lx,
-               d.dept_ywfl,
-               djyjzfs,
-               djyjkfs,
-               djyjkfbl,
-               djyjdf,
-               sztszfs,
-               sztskfs,
-               sztsfbl,
-               sztsdf,
-               glgfzfs,
-               glgfkfs,
-               glgfbl,
-               glgfdf,
-               ywcxzfs,
-               ywcxkfs,
-               ywcxbl,
-               ywcxdf,
-               sffjxs,
-               zkf,
-               zkfbl,
-               zdf,
-               zhdf,
-               a.create_by,
-               a.create_time,
-               a.update_by,
-               a.update_time,
-               remark,
-               yl1,
-               yl2,
-               yl3,
-               yl4,
-               yl5,d.dept_name,p.dept_name parent_name
-        from sj_gfjs_zsdwkhpj_zb a
-                 left join sys_dept d on a.dept_id=d.dept_id
-                 left join sys_dept p on a.parent_dept_id=p.dept_id    </sql>
-    <select id="selectSjGfjsZsdwkhpjZbList" parameterType="SjGfjsZsdwkhpjZb" resultMap="SjGfjsZsdwkhpjZbResult">
-        <include refid="selectSjGfjsZsdwkhpjZbVo"/>
-        <where>
-            <if test="deptId != null ">and (a.dept_id = #{deptId} or  find_in_set(#{deptId},d.ancestors))</if>
-            <if test="parentDeptId != null "> and parent_dept_id = #{parentDeptId}</if>
-            <if test="nd != null  and nd != ''"> and nd = #{nd}</if>
-            <if test="zqfw != null  and zqfw != ''"> and zqfw = #{zqfw}</if>
-            <if test="zqlx != null  and zqlx != ''"> and zqlx = #{zqlx}</if>
-            <if test="jb != null  and jb != ''"> and jb = #{jb}</if>
-            <if test="deptDfl != null  and deptDfl != ''"> and a.dept_dfl = #{deptDfl}</if>
-            <if test="deptLx != null  and deptLx != ''"> and dept_lx = #{deptLx}</if>
-            <if test="deptYwfl != null  and deptYwfl != ''"> and a.dept_ywfl = #{deptYwfl}</if>
-            <if test="djyjzfs != null "> and djyjzfs = #{djyjzfs}</if>
-            <if test="djyjkfs != null "> and djyjkfs = #{djyjkfs}</if>
-            <if test="djyjkfbl != null "> and djyjkfbl = #{djyjkfbl}</if>
-            <if test="djyjdf != null "> and djyjdf = #{djyjdf}</if>
-            <if test="sztszfs != null "> and sztszfs = #{sztszfs}</if>
-            <if test="sztskfs != null "> and sztskfs = #{sztskfs}</if>
-            <if test="sztsfbl != null "> and sztsfbl = #{sztsfbl}</if>
-            <if test="sztsdf != null "> and sztsdf = #{sztsdf}</if>
-            <if test="glgfzfs != null "> and glgfzfs = #{glgfzfs}</if>
-            <if test="glgfkfs != null "> and glgfkfs = #{glgfkfs}</if>
-            <if test="glgfbl != null "> and glgfbl = #{glgfbl}</if>
-            <if test="glgfdf != null "> and glgfdf = #{glgfdf}</if>
-            <if test="ywcxzfs != null "> and ywcxzfs = #{ywcxzfs}</if>
-            <if test="ywcxkfs != null "> and ywcxkfs = #{ywcxkfs}</if>
-            <if test="ywcxbl != null "> and ywcxbl = #{ywcxbl}</if>
-            <if test="ywcxdf != null "> and ywcxdf = #{ywcxdf}</if>
-            <if test="sffjxs != null "> and sffjxs = #{sffjxs}</if>
-            <if test="zkf != null "> and zkf = #{zkf}</if>
-            <if test="zkfbl != null "> and zkfbl = #{zkfbl}</if>
-            <if test="zdf != null "> and zdf = #{zdf}</if>
-            <if test="zhdf != null "> and zhdf = #{zhdf}</if>
-            <if test="yl1 != null  and yl1 != ''"> and yl1 = #{yl1}</if>
-            <if test="yl2 != null  and yl2 != ''"> and yl2 = #{yl2}</if>
-            <if test="yl3 != null  and yl3 != ''"> and yl3 = #{yl3}</if>
-            <if test="yl4 != null  and yl4 != ''"> and yl4 = #{yl4}</if>
-            <if test="yl5 != null  and yl5 != ''"> and yl5 = #{yl5}</if>
-            <if test="df != null "> and zdf &lt;= #{df}</if>
-            <if test="kfbl != null "> and zkfbl >= #{kfbl}</if>
-            <if test="fjx != null and fjx.toString()=='1'.toString() "> and sffjxs >= #{fjx}</if>
-            <if test="fjx != null and fjx.toString()=='0'.toString() "> and sffjxs = #{fjx}</if>
-            <!-- 数据范围过滤 -->
-            ${params.dataScope}
-        </where>
-        order by zhdf desc
-    </select>
-    <select id="selectSjGfjsZsdwkhpjZbById" parameterType="Long" resultMap="SjGfjsZsdwkhpjZbResult">
-        <include refid="selectSjGfjsZsdwkhpjZbVo"/>
-        where id = #{id}
-    </select>
-    <select id="selectSjGfjsZsdwkhpjZb" resultType="com.qianhe.domain.SjGfjsZsdwkhpjZb">
-        select *from sj_gfjs_zsdwkhpj_zb where nd=#{nd}  and dept_id=#{deptId} and zqfw=#{zqfw}
-    </select>
-    <insert id="insertSjGfjsZsdwkhpjZb" parameterType="SjGfjsZsdwkhpjZb" useGeneratedKeys="true" keyProperty="id">
-        insert into sj_gfjs_zsdwkhpj_zb
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="deptId != null">dept_id,</if>
-            <if test="parentDeptId != null">parent_dept_id,</if>
-            <if test="nd != null">nd,</if>
-            <if test="zqfw != null">zqfw,</if>
-            <if test="zqlx != null">zqlx,</if>
-            <if test="jb != null">jb,</if>
-            <if test="deptDfl != null">dept_dfl,</if>
-            <if test="deptLx != null">dept_lx,</if>
-            <if test="deptYwfl != null">dept_ywfl,</if>
-            <if test="djyjzfs != null">djyjzfs,</if>
-            <if test="djyjkfs != null">djyjkfs,</if>
-            <if test="djyjkfbl != null">djyjkfbl,</if>
-            <if test="djyjdf != null">djyjdf,</if>
-            <if test="sztszfs != null">sztszfs,</if>
-            <if test="sztskfs != null">sztskfs,</if>
-            <if test="sztsfbl != null">sztsfbl,</if>
-            <if test="sztsdf != null">sztsdf,</if>
-            <if test="glgfzfs != null">glgfzfs,</if>
-            <if test="glgfkfs != null">glgfkfs,</if>
-            <if test="glgfbl != null">glgfbl,</if>
-            <if test="glgfdf != null">glgfdf,</if>
-            <if test="ywcxzfs != null">ywcxzfs,</if>
-            <if test="ywcxkfs != null">ywcxkfs,</if>
-            <if test="ywcxbl != null">ywcxbl,</if>
-            <if test="ywcxdf != null">ywcxdf,</if>
-            <if test="sffjxs != null">sffjxs,</if>
-            <if test="zkf != null">zkf,</if>
-            <if test="zkfbl != null">zkfbl,</if>
-            <if test="zdf != null">zdf,</if>
-            <if test="zhdf != null">zhdf,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="updateTime != null">update_time,</if>
-            <if test="remark != null">remark,</if>
-            <if test="yl1 != null">yl1,</if>
-            <if test="yl2 != null">yl2,</if>
-            <if test="yl3 != null">yl3,</if>
-            <if test="yl4 != null">yl4,</if>
-            <if test="yl5 != null">yl5,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="deptId != null">#{deptId},</if>
-            <if test="parentDeptId != null">#{parentDeptId},</if>
-            <if test="nd != null">#{nd},</if>
-            <if test="zqfw != null">#{zqfw},</if>
-            <if test="zqlx != null">#{zqlx},</if>
-            <if test="jb != null">#{jb},</if>
-            <if test="deptDfl != null">#{deptDfl},</if>
-            <if test="deptLx != null">#{deptLx},</if>
-            <if test="deptYwfl != null">#{deptYwfl},</if>
-            <if test="djyjzfs != null">#{djyjzfs},</if>
-            <if test="djyjkfs != null">#{djyjkfs},</if>
-            <if test="djyjkfbl != null">#{djyjkfbl},</if>
-            <if test="djyjdf != null">#{djyjdf},</if>
-            <if test="sztszfs != null">#{sztszfs},</if>
-            <if test="sztskfs != null">#{sztskfs},</if>
-            <if test="sztsfbl != null">#{sztsfbl},</if>
-            <if test="sztsdf != null">#{sztsdf},</if>
-            <if test="glgfzfs != null">#{glgfzfs},</if>
-            <if test="glgfkfs != null">#{glgfkfs},</if>
-            <if test="glgfbl != null">#{glgfbl},</if>
-            <if test="glgfdf != null">#{glgfdf},</if>
-            <if test="ywcxzfs != null">#{ywcxzfs},</if>
-            <if test="ywcxkfs != null">#{ywcxkfs},</if>
-            <if test="ywcxbl != null">#{ywcxbl},</if>
-            <if test="ywcxdf != null">#{ywcxdf},</if>
-            <if test="sffjxs != null">#{sffjxs},</if>
-            <if test="zkf != null">#{zkf},</if>
-            <if test="zkfbl != null">#{zkfbl},</if>
-            <if test="zdf != null">#{zdf},</if>
-            <if test="zhdf != null">#{zhdf},</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="updateSjGfjsZsdwkhpjZb" parameterType="SjGfjsZsdwkhpjZb">
-        update sj_gfjs_zsdwkhpj_zb
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="parentDeptId != null">parent_dept_id = #{parentDeptId},</if>
-            <if test="nd != null">nd = #{nd},</if>
-            <if test="zqfw != null">zqfw = #{zqfw},</if>
-            <if test="zqlx != null">zqlx = #{zqlx},</if>
-            <if test="jb != null">jb = #{jb},</if>
-            <if test="deptDfl != null">dept_dfl = #{deptDfl},</if>
-            <if test="deptLx != null">dept_lx = #{deptLx},</if>
-            <if test="deptYwfl != null">dept_ywfl = #{deptYwfl},</if>
-            <if test="djyjzfs != null">djyjzfs = #{djyjzfs},</if>
-            <if test="djyjkfs != null">djyjkfs = #{djyjkfs},</if>
-            <if test="djyjkfbl != null">djyjkfbl = #{djyjkfbl},</if>
-            <if test="djyjdf != null">djyjdf = #{djyjdf},</if>
-            <if test="sztszfs != null">sztszfs = #{sztszfs},</if>
-            <if test="sztskfs != null">sztskfs = #{sztskfs},</if>
-            <if test="sztsfbl != null">sztsfbl = #{sztsfbl},</if>
-            <if test="sztsdf != null">sztsdf = #{sztsdf},</if>
-            <if test="glgfzfs != null">glgfzfs = #{glgfzfs},</if>
-            <if test="glgfkfs != null">glgfkfs = #{glgfkfs},</if>
-            <if test="glgfbl != null">glgfbl = #{glgfbl},</if>
-            <if test="glgfdf != null">glgfdf = #{glgfdf},</if>
-            <if test="ywcxzfs != null">ywcxzfs = #{ywcxzfs},</if>
-            <if test="ywcxkfs != null">ywcxkfs = #{ywcxkfs},</if>
-            <if test="ywcxbl != null">ywcxbl = #{ywcxbl},</if>
-            <if test="ywcxdf != null">ywcxdf = #{ywcxdf},</if>
-            <if test="sffjxs != null">sffjxs = #{sffjxs},</if>
-            <if test="zkf != null">zkf = #{zkf},</if>
-            <if test="zkfbl != null">zkfbl = #{zkfbl},</if>
-            <if test="zdf != null">zdf = #{zdf},</if>
-            <if test="zhdf != null">zhdf = #{zhdf},</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="deleteSjGfjsZsdwkhpjZbById" parameterType="Long">
-        delete from sj_gfjs_zsdwkhpj_zb where id = #{id}
-    </delete>
-    <delete id="deleteSjGfjsZsdwkhpjZbByIds" parameterType="String">
-        delete from sj_gfjs_zsdwkhpj_zb where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>
--- a/qianhe-ydsj/src/main/resources/mapper/SjGfjsYdjcjlMapper.xml
+++ b/qianhe-ydsj/src/main/resources/mapper/SjGfjsYdjcjlMapper.xml
@@ -20,9 +20,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        <result property="yl4"    column="yl4"    />
        <result property="yl5"    column="yl5"    />
        <result property="sfczwt"    column="sfczwt"    />
+        <result property="zt"    column="zt"    />
        <result property="deptName"    column="dept_name"    />
        <result property="deptLx"    column="dept_lx"    />
+        <result property="wtzs"    column="wtzs"    />
+        <result property="yzgsl"    column="yzgsl"    />
    </resultMap>
    <resultMap id="SjGfjsYdjcjlSjGfjsZsdwwtcjResult" type="SjGfjsYdjcjl" extends="SjGfjsYdjcjlResult">
        <collection property="sjGfjsZsdwwtcjList" notNullColumn="sub_id" javaType="java.util.List" resultMap="SjGfjsZsdwwtcjResult" />
@@ -71,7 +74,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
               yl2,
               yl3,
               yl4,
-               yl5, sfczwt, d.dept_name,d.dept_lx
+               yl5, sfczwt, a.zt, d.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
    </sql>
@@ -87,6 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            <if test="yl4 != null  and yl4 != ''"> and yl4 = #{yl4}</if>
            <if test="yl5 != null  and yl5 != ''"> and yl5 = #{yl5}</if>
            <if test="sfczwt != null  and sfczwt != ''"> and sfczwt = #{sfczwt}</if>
+            <if test="zt != null  and zt != ''"> and zt = #{zt}</if>
            <if test="startRq != null  and startRq != ''"> and rq >= #{startRq}</if>
            <if test="endRq != null  and endRq != ''"> and rq &lt;= #{endRq}</if>
            <!-- 数据范围过滤 -->
@@ -106,6 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            <if test="yl4 != null  and yl4 != ''"> and yl4 = #{yl4}</if>
            <if test="yl5 != null  and yl5 != ''"> and yl5 = #{yl5}</if>
            <if test="sfczwt != null  and sfczwt != ''"> and sfczwt = #{sfczwt}</if>
+            <if test="zt != null  and zt != ''"> and zt = #{zt}</if>
            <if test="startRq != null  and startRq != ''"> and rq >= #{startRq}</if>
            <if test="endRq != null  and endRq != ''"> and rq &lt;= #{endRq}</if>
        </where>
@@ -113,8 +120,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
    </select>
    <select id="selectSjGfjsYdjcjlById" parameterType="Long" resultMap="SjGfjsYdjcjlSjGfjsZsdwwtcjResult">
-        select a.id, a.dept_id, a.rq, a.jcjb, a.create_by, a.create_time, a.update_by, a.update_time, a.remark, a.yl1, a.yl2, a.yl3, a.yl4, a.yl5, a.sfczwt,
+        select a.id, a.dept_id, a.rq, a.jcjb, a.create_by, a.create_time, a.update_by, a.update_time, a.remark,
-               b.id as sub_id, b.dept_id as sub_dept_id, b.rq as sub_rq, b.jcjb as sub_jcjb, b.wtmc as sub_wtmc, b.khnr as sub_khnr, b.khxd as sub_khxd, b.pjbzid as sub_pjbzid, b.pjbzmc as sub_pjbzmc, b.zgzrr as sub_zgzrr, b.zgcs as sub_zgcs, b.zgqx as sub_zgqx, b.zgzt as sub_zgzt, b.create_by as sub_create_by, b.create_time as sub_create_time, b.update_by as sub_update_by, b.update_time as sub_update_time, b.remark as sub_remark, b.yl1 as sub_yl1, b.yl2 as sub_yl2, b.yl3 as sub_yl3, b.yl4 as sub_yl4, b.yl5 as sub_yl5,
+               a.yl1, a.yl2, a.yl3, a.yl4, a.yl5, a.sfczwt, a.zt,
+               b.id as sub_id, b.dept_id as sub_dept_id, b.rq as sub_rq, b.jcjb as sub_jcjb, b.wtmc as sub_wtmc,
+               b.khnr as sub_khnr, b.khxd as sub_khxd, b.pjbzid as sub_pjbzid, b.pjbzmc as sub_pjbzmc,
+               b.zgzrr as sub_zgzrr, b.zgcs as sub_zgcs, b.zgqx as sub_zgqx, b.zgzt as sub_zgzt,
+               b.create_by as sub_create_by, b.create_time as sub_create_time, b.update_by as sub_update_by,
+               b.update_time as sub_update_time, b.remark as sub_remark, b.yl1 as sub_yl1, b.yl2 as sub_yl2,
+               b.yl3 as sub_yl3, b.yl4 as sub_yl4, b.yl5 as sub_yl5,
               b.pid as sub_pid, d.dept_name, d.dept_lx
        from sj_gfjs_ydjcjl a
        left join sj_gfjs_zsdwwtcj b on b.pid = a.id
@@ -141,6 +154,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            <if test="yl4 != null">yl4,</if>
            <if test="yl5 != null">yl5,</if>
            <if test="sfczwt != null">sfczwt,</if>
+            <if test="zt != null">zt,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="deptId != null">#{deptId},</if>
@@ -157,6 +171,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            <if test="yl4 != null">#{yl4},</if>
            <if test="yl5 != null">#{yl5},</if>
            <if test="sfczwt != null">#{sfczwt},</if>
+            <if test="zt != null">#{zt},</if>
        </trim>
    </insert>
    <update id="updateSjGfjsYdjcjl" parameterType="SjGfjsYdjcjl">
@@ -176,6 +191,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            <if test="yl4 != null">yl4 = #{yl4},</if>
            <if test="yl5 != null">yl5 = #{yl5},</if>
            <if test="sfczwt != null">sfczwt = #{sfczwt},</if>
+            <if test="zt != null">zt = #{zt},</if>
        </trim>
        where id = #{id}
    </update>

--- a/qianhe-ydsj/src/main/resources/mapper/SjGfjsZsdwfjxcjMapper.xml
+++ b/qianhe-ydsj/src/main/resources/mapper/SjGfjsZsdwfjxcjMapper.xml
@@ -22,6 +22,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        <result property="yl3"    column="yl3"    />
        <result property="yl4"    column="yl4"    />
        <result property="yl5"    column="yl5"    />
+        <result property="zt"    column="zt"    />
        <result property="deptName"    column="dept_name"    />
    </resultMap>
@@ -42,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
               yl2,
               yl3,
               yl4,
-               yl5,d.dept_name,
+               yl5,zt,d.dept_name,
                 c.dept_name as yl3name
        from sj_gfjs_zsdwfjxcj a
                 left join  sys_dept d on a.dept_id=d.dept_id
@@ -63,6 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            <if test="yl3 != null  and yl3 != ''"> and yl3 = #{yl3}</if>
            <if test="yl4 != null  and yl4 != ''"> and yl4 = #{yl4}</if>
            <if test="yl5 != null  and yl5 != ''"> and yl5 = #{yl5}</if>
+            <if test="zt != null  and zt != ''"> and zt = #{zt}</if>
            <if test="startRq != null  and startRq != ''"> and rq >= #{startRq}</if>
            <if test="endRq != null  and endRq != ''"> and rq &lt;= #{endRq}</if>
            <!-- 数据范围过滤 -->
@@ -96,6 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            <if test="yl3 != null">yl3,</if>
            <if test="yl4 != null">yl4,</if>
            <if test="yl5 != null">yl5,</if>
+            <if test="zt != null">zt,</if>
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="deptId != null">#{deptId},</if>
@@ -114,13 +118,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            <if test="yl3 != null">#{yl3},</if>
            <if test="yl4 != null">#{yl4},</if>
            <if test="yl5 != null">#{yl5},</if>
+            <if test="zt != null">#{zt},</if>
         </trim>
    </insert>
    <insert id="batchSave">
-        insert into sj_gfjs_zsdwfjxcj( id, dept_id, rq, flmc, pjbzid, pjbzmc, wtmc,create_by,create_time,remark,yl1,yl2,yl3,yl4,yl5) values
+        insert into sj_gfjs_zsdwfjxcj( id, dept_id, rq, flmc, pjbzid, pjbzmc, wtmc,create_by,create_time,remark,yl1,yl2,yl3,yl4,yl5,zt) values
        <foreach item="item" index="index" collection="list" separator=",">
            ( #{item.id}, #{item.deptId}, #{item.rq}, #{item.flmc}, #{item.pjbzid}, #{item.pjbzmc}, #{item.wtmc}
-            , #{item.createBy}, #{item.createTime},  #{item.remark},#{item.yl1}, #{item.yl2}, #{item.yl3}, #{item.yl4}, #{item.yl5})
+            , #{item.createBy}, #{item.createTime},  #{item.remark},#{item.yl1}, #{item.yl2}, #{item.yl3}, #{item.yl4}, #{item.yl5}, #{zt})
        </foreach>
    </insert>
@@ -143,6 +148,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            <if test="yl3 != null">yl3 = #{yl3},</if>
            <if test="yl4 != null">yl4 = #{yl4},</if>
            <if test="yl5 != null">yl5 = #{yl5},</if>
+            <if test="zt != null">zt = #{zt},</if>
        </trim>
        where id = #{id}
    </update>
@@ -157,4 +163,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            #{id}
        </foreach>
    </delete>
+    <!--批量修改 根据ids-->
+    <update id="plxg" parameterType="SjGfjsZsdwfjxcj">
+        update sj_gfjs_zsdwfjxcj
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="zt != null">zt = #{zt},</if>
+        </trim>
+        where FIND_IN_SET(id, #{ids})
+    </update>
 </mapper>
\ No newline at end of file
--- a/qianhe-ydsj/src/main/resources/mapper/SjGfjsZsdwkhpjZbMapper.xml
+++ b/qianhe-ydsj/src/main/resources/mapper/SjGfjsZsdwkhpjZbMapper.xml
@@ -50,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        <result property="parentName"    column="parent_name"    />
        <result property="pm"    column="pm"    />
+        <result property="zt"    column="zt"    />
    </resultMap>
    <sql id="selectSjGfjsZsdwkhpjZbVo">
@@ -94,7 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
               yl2,
               yl3,
               yl4,
-               yl5,d.dept_name,p.dept_name parent_name, a.pm
+               yl5,d.dept_name,p.dept_name parent_name, a.pm, a.zt
        from sj_gfjs_zsdwkhpj_zb a
                 left join sys_dept d on a.dept_id=d.dept_id
                 left join sys_dept p on a.parent_dept_id=p.dept_id    </sql>
@@ -138,6 +139,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            <if test="yl4 != null  and yl4 != ''"> and yl4 = #{yl4}</if>
            <if test="yl5 != null  and yl5 != ''"> and yl5 = #{yl5}</if>
            <if test="pm != null  and pm != ''"> and pm = #{pm}</if>
+            <if test="zt != null  and zt != ''"> and zt = #{zt}</if>
            <if test="df != null "> and zdf &lt;= #{df}</if>
            <if test="kfbl != null "> and zkfbl >= #{kfbl}</if>
            <if test="fjx != null and fjx.toString()=='1'.toString() "> and sffjxs >= #{fjx}</if>
@@ -200,6 +202,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            <if test="yl4 != null">yl4,</if>
            <if test="yl5 != null">yl5,</if>
            <if test="pm != null">pm,</if>
+            <if test="zt != null">zt,</if>
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="deptId != null">#{deptId},</if>
@@ -243,6 +246,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            <if test="yl4 != null">#{yl4},</if>
            <if test="yl5 != null">#{yl5},</if>
            <if test="pm != null">#{pm},</if>
+            <if test="zt != null">#{zt},</if>
         </trim>
    </insert>
@@ -290,6 +294,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            <if test="yl4 != null">yl4 = #{yl4},</if>
            <if test="yl5 != null">yl5 = #{yl5},</if>
            <if test="pm != null">pm = #{pm},</if>
+            <if test="zt != null">zt = #{zt},</if>
        </trim>
        where id = #{id}
    </update>

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