Skip to content

Q
qianhe-ydsj
Commit 69fbe7d3 by wangjian
Options

2025-07-28 规范建设 V4

parent a0662ff5
Showing with 537 additions and 108 deletions
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));
......
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
*/
......
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.Workbook;
import org.apache.poi.ss.usermodel.WorkbookFactory;
import org.apache.poi.ss.usermodel.*;
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));
}
}
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
*/
......
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));
}
}
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 sjGfjsYdjcjlMapper;
private SjGfjsZsdwwtcjMapper sjGfjsZsdwwtcjMapper;
@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));
......
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;//查询结果 已整改数量
}
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
}
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;
/** 数量 */
......
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;
}
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
}
qianhe-ydsj/src/main/java/com/qianhe/mapper/SjGfjsJcdwkhpjZbMapper.java deleted 100644 → 0
package com.qianhe.mapper;
import com.qianhe.domain.SjGfjsZsdwkhpjZb;
import java.util.List;
/**
* 规范建设-基层单位考核评价主Mapper接口
*
* @author qianhe
* @date 2024-07-24
*/
public interface SjGfjsJcdwkhpjZbMapper
{
/**
* 查询规范建设-基层单位考核评价主
*
* @param id 规范建设-基层单位考核评价主主键
* @return 规范建设-基层单位考核评价主
*/
public SjGfjsZsdwkhpjZb selectSjGfjsZsdwkhpjZbById(Long id);
/**
* 查询规范建设-基层单位考核评价主列表
*
* @param sjGfjsZsdwkhpjZb 规范建设-基层单位考核评价主
* @return 规范建设-基层单位考核评价主集合
*/
public List<SjGfjsZsdwkhpjZb> selectSjGfjsZsdwkhpjZbList(SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZb);
/**
* 新增规范建设-基层单位考核评价主
*
* @param sjGfjsZsdwkhpjZb 规范建设-基层单位考核评价主
* @return 结果
*/
public int insertSjGfjsZsdwkhpjZb(SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZb);
/**
* 修改规范建设-基层单位考核评价主
*
* @param sjGfjsZsdwkhpjZb 规范建设-基层单位考核评价主
* @return 结果
*/
public int updateSjGfjsZsdwkhpjZb(SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZb);
/**
* 删除规范建设-基层单位考核评价主
*
* @param id 规范建设-基层单位考核评价主主键
* @return 结果
*/
public int deleteSjGfjsZsdwkhpjZbById(Long id);
/**
* 批量删除规范建设-基层单位考核评价主
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteSjGfjsZsdwkhpjZbByIds(Long[] ids);
SjGfjsZsdwkhpjZb selectSjGfjsZsdwkhpjZb(SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZb);
}
qianhe-ydsj/src/main/java/com/qianhe/mapper/SjGfjsZsdwfjxcjMapper.java
......@@ -62,6 +62,7 @@ public interface SjGfjsZsdwfjxcjMapper
int batchSave(List<SjGfjsZsdwfjxcj> list);
int plxg(SjGfjsZsdwfjxcj sjGfjsZsdwfjxcj);
}
qianhe-ydsj/src/main/java/com/qianhe/mapper/SjGfjsZsdwwtcjMapper.java 0 → 100644
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);
}
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);//月度检查记录提交
/**
* 批量删除指导帮扶-基层单位问题采集
......
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);
}
qianhe-ydsj/src/main/java/com/qianhe/service/ISjGfjsZsdwwtcjService.java 0 → 100644
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);
}
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);
}
......
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);
}
/**
* 批量删除规范建设 月度检查记录
......
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);
}
}
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);
}
......
qianhe-ydsj/src/main/java/com/qianhe/service/impl/SjGfjsZsdwwtcjServiceImpl.java 0 → 100644
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);
}
}
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,
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,
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, 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>
......
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
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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment