Skip to content

Q
qianhe-ydsj
Commit 5afeef4d by wangjian
Options

2025-10-23 wj 试运行修改

parent d60dd3d1
Showing with 111 additions and 43 deletions
qianhe-common/src/main/java/com/qianhe/common/core/domain/entity/SysDept.java
...@@ -70,6 +70,10 @@ public class SysDept extends BaseEntity ...@@ -70,6 +70,10 @@ public class SysDept extends BaseEntity
// @Excel(name = "单位业务分类") // @Excel(name = "单位业务分类")
private String deptYwfl; private String deptYwfl;
//传入参数 是否基层单位 1 时需要是基层单位的。 dwjb 4 时，查询从表的dwlx字段 中 有一部分dwlx不属于基层
private String ifjcdw;
/** 子部门 */ /** 子部门 */
private List<SysDept> children = new ArrayList<SysDept>(); private List<SysDept> children = new ArrayList<SysDept>();
......
qianhe-system/src/main/resources/mapper/system/SysDeptMapper.xml
...@@ -27,39 +27,45 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -27,39 +27,45 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectDeptVo"> <sql id="selectDeptVo">
select d.dept_id, d.parent_id, select distinct d.dept_id, d.parent_id,
d.ancestors, d.dept_name, d.ancestors, d.dept_name,
d.order_num, d.leader, d.phone, d.order_num, d.leader, d.phone,
d.email, d.status, d.del_flag, d.create_by, d.create_time,d.dwjb, d.dept_lx, d.dept_dfl, d.dept_ywfl d.email, d.status, d.del_flag, d.create_by, d.create_time,d.dwjb, d.dept_lx, d.dept_dfl, d.dept_ywfl
from sys_dept d from sys_dept d
left join sys_dept_cb c on d.dept_id = c.dept_id
</sql> </sql>
<select id="selectDeptList" parameterType="SysDept" resultMap="SysDeptResult"> <select id="selectDeptList" parameterType="SysDept" resultMap="SysDeptResult">
<include refid="selectDeptVo"/> <include refid="selectDeptVo"/>
where d.del_flag = '0' where d.del_flag = '0'
<if test="deptId != null and deptId != 0"> <if test="deptId != null and deptId != 0">
AND ( dept_id = #{deptId} or find_in_set(#{deptId}, d.ancestors) ) AND ( d.dept_id = #{deptId} or find_in_set(#{deptId}, d.ancestors) )
</if> </if>
<if test="parentId != null and parentId != 0"> <if test="parentId != null and parentId != 0">
AND parent_id = #{parentId} AND d.parent_id = #{parentId}
</if> </if>
<if test="deptName != null and deptName != ''"> <if test="deptName != null and deptName != ''">
AND dept_name like concat('%', #{deptName}, '%') AND d.dept_name like concat('%', #{deptName}, '%')
</if> </if>
<if test="status != null and status != ''"> <if test="status != null and status != ''">
AND status = #{status} AND d.status = #{status}
</if> </if>
<if test="dwjb != null and dwjb != ''"> <if test="dwjb != null and dwjb != ''">
AND d.dwjb &lt;= #{dwjb} AND d.dwjb &lt;= #{dwjb}
</if> </if>
<if test="deptYwfl != null and deptYwfl != ''"> <if test="deptYwfl != null and deptYwfl != ''">
AND dept_ywfl like concat('%', #{deptYwfl}, '%') AND d.dept_ywfl like concat('%', #{deptYwfl}, '%')
</if> </if>
<if test="deptDfl != null and deptDfl != ''"> <if test="deptDfl != null and deptDfl != ''">
AND dept_dfl like concat('%', #{deptDfl}, '%') AND d.dept_dfl like concat('%', #{deptDfl}, '%')
</if> </if>
<if test="deptLx != null and deptLx != ''"> <if test="deptLx != null and deptLx != ''">
AND dept_lx like concat('%', #{deptLx}, '%') AND d.dept_lx like concat('%', #{deptLx}, '%')
</if>
<if test="ifjcdw != null and ifjcdw != '' and ifjcdw == '1'.toString() ">
and ( d.dwjb in ('1','2','3') or
( d.dwjb in ('4') and c.dwlx in ('采油（气）管理区','采油（气）管理单位','科研监督类','后勤服务类','生产保障类') )
)
</if> </if>
<!-- 数据范围过滤 --> <!-- 数据范围过滤 -->
${params.dataScope} ${params.dataScope}
......
qianhe-ydsj/src/main/java/com/qianhe/controller/AmainController.java
...@@ -142,8 +142,8 @@ public class AmainController extends BaseController ...@@ -142,8 +142,8 @@ public class AmainController extends BaseController
title = "基层单位例会提交情况"; title = "基层单位例会提交情况";
// 单位信息 // 单位信息
SysDept dept = new SysDept(); SysDept dept = new SysDept();
dept.setParentId(deptId); dept.setDeptId(deptId);
depts = deptService.selectDeptList_sjdw(dept); depts = deptService.selectDeptList_ejdw(dept);
// 例会信息 // 例会信息
SjLhsc sjLhsc = new SjLhsc(); SjLhsc sjLhsc = new SjLhsc();
sjLhsc.setStartJd(startJd); sjLhsc.setStartJd(startJd);
...@@ -167,6 +167,8 @@ public class AmainController extends BaseController ...@@ -167,6 +167,8 @@ public class AmainController extends BaseController
sjLhsc.setDwjb("4"); sjLhsc.setDwjb("4");
sjLhsc.setDeptId(deptId + ""); sjLhsc.setDeptId(deptId + "");
lhList = sjLhscService.selectSjLhscList_main(sjLhsc); lhList = sjLhscService.selectSjLhscList_main(sjLhsc);
lhList = new ArrayList<>();
depts = new ArrayList<>();
} }
// 封装公共数据并返回 // 封装公共数据并返回
...@@ -249,8 +251,8 @@ public class AmainController extends BaseController ...@@ -249,8 +251,8 @@ public class AmainController extends BaseController
} else if ("B".equals(sylx)) { } else if ("B".equals(sylx)) {
// B角色：查询下属基层单位及对应费用 // B角色：查询下属基层单位及对应费用
SysDept deptQuery = new SysDept(); SysDept deptQuery = new SysDept();
deptQuery.setParentId(deptId); // 按当前部门ID筛选子单位 deptQuery.setDeptId(deptId); // 按当前部门ID筛选子单位
depts = deptService.selectDeptList_sjdw(deptQuery); depts = deptService.selectDeptList_ejdw(deptQuery);
SjFybpZb fyQuery = new SjFybpZb(); SjFybpZb fyQuery = new SjFybpZb();
fyQuery.setFyrq(nd); // 按年份筛选 fyQuery.setFyrq(nd); // 按年份筛选
......
qianhe-ydsj/src/main/java/com/qianhe/controller/SjGfjsBfzjcController.java
...@@ -228,13 +228,15 @@ public class SjGfjsBfzjcController extends BaseController ...@@ -228,13 +228,15 @@ public class SjGfjsBfzjcController extends BaseController
} }
zsdwwtcj.setWtmc(wtms); zsdwwtcj.setWtmc(wtms);
String zgzrr=new DataFormatter().formatCellValue(row.getCell(6)) ; String ldnr=new DataFormatter().formatCellValue(row.getCell(6)) ;
zsdwwtcj.setLdnr(ldnr);
String zgzrr=new DataFormatter().formatCellValue(row.getCell(7)) ;
zsdwwtcj.setZgzrr(zgzrr); zsdwwtcj.setZgzrr(zgzrr);
String zgcs=new DataFormatter().formatCellValue(row.getCell(7)) ; String zgcs=new DataFormatter().formatCellValue(row.getCell(8)) ;
zsdwwtcj.setZgcs(zgcs); zsdwwtcj.setZgcs(zgcs);
String zgqx=new DataFormatter().formatCellValue(row.getCell(8)) ; String zgqx=new DataFormatter().formatCellValue(row.getCell(9)) ;
zsdwwtcj.setZgqx(zgqx); zsdwwtcj.setZgqx(zgqx);
String zgzt=new DataFormatter().formatCellValue(row.getCell(9)) ; String zgzt=new DataFormatter().formatCellValue(row.getCell(10)) ;
zsdwwtcj.setZgzt(zgzt); zsdwwtcj.setZgzt(zgzt);
zsdwwtcj.setJcjb("帮扶组检查"); zsdwwtcj.setJcjb("帮扶组检查");
zsdwwtcj.setCreateTime(DateUtils.getNowDate()); zsdwwtcj.setCreateTime(DateUtils.getNowDate());
......
qianhe-ydsj/src/main/java/com/qianhe/controller/SjGfjsBfzkhpjController.java
...@@ -206,6 +206,12 @@ public class SjGfjsBfzkhpjController extends BaseController ...@@ -206,6 +206,12 @@ public class SjGfjsBfzkhpjController extends BaseController
.map(SjGfjsZsdwwtcj::getWtmc).collect(Collectors.toList()); .map(SjGfjsZsdwwtcj::getWtmc).collect(Collectors.toList());
zsdwkhpj.setSj(collect.size()+""); zsdwkhpj.setSj(collect.size()+"");
zsdwkhpj.setWtms(String.join(";",collect)); zsdwkhpj.setWtms(String.join(";",collect));
//亮点合并
List<String> collect_ldnr = sjGfjsZsdwwtcjs.stream()
.filter(item -> item.getKhnr().equals(zsdwkhpj.getKhnr()) && item.getKhxd().equals(zsdwkhpj.getKhxd()))
.map(SjGfjsZsdwwtcj::getLdnr).collect(Collectors.toList());
zsdwkhpj.setLdnr(String.join(";",collect_ldnr));
addList.add(zsdwkhpj); addList.add(zsdwkhpj);
} }
...@@ -284,6 +290,7 @@ public class SjGfjsBfzkhpjController extends BaseController ...@@ -284,6 +290,7 @@ public class SjGfjsBfzkhpjController extends BaseController
Cell cell = row.createCell(m++);cell.setCellStyle(cellStyle); cell.setCellValue(zsdwkhpj.getKhnr()); Cell cell = row.createCell(m++);cell.setCellStyle(cellStyle); cell.setCellValue(zsdwkhpj.getKhnr());
cell = row.createCell(m++);cell.setCellStyle(cellStyle); cell.setCellValue(zsdwkhpj.getKhxd()); cell = row.createCell(m++);cell.setCellStyle(cellStyle); cell.setCellValue(zsdwkhpj.getKhxd());
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.getLdnr());
cell = row.createCell(m++);cell.setCellStyle(cellStyle); cell.setCellValue(zsdwkhpj.getKhfz()); 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.getId());
cell = row.createCell(m++);cell.setCellStyle(cellStyle); cell.setCellValue(zsdwkhpj.getZbId()); cell = row.createCell(m++);cell.setCellStyle(cellStyle); cell.setCellValue(zsdwkhpj.getZbId());
...@@ -444,13 +451,13 @@ public class SjGfjsBfzkhpjController extends BaseController ...@@ -444,13 +451,13 @@ public class SjGfjsBfzkhpjController extends BaseController
SjGfjsZsdwkhpj zsdwkhpj=new SjGfjsZsdwkhpj(); SjGfjsZsdwkhpj zsdwkhpj=new SjGfjsZsdwkhpj();
System.out.println(row); System.out.println(row);
//id //id
String id=new DataFormatter().formatCellValue(row.getCell(4)); String id=new DataFormatter().formatCellValue(row.getCell(5));
if(StringUtils.isEmpty(id)){ if(StringUtils.isEmpty(id)){
return AjaxResult.error("id不能为空"); return AjaxResult.error("id不能为空");
} }
zsdwkhpj.setId(Long.parseLong(id)); zsdwkhpj.setId(Long.parseLong(id));
//主表id //主表id
String zbid=new DataFormatter().formatCellValue(row.getCell(5)); String zbid=new DataFormatter().formatCellValue(row.getCell(6));
if(StringUtils.isEmpty(zbid)){ if(StringUtils.isEmpty(zbid)){
return AjaxResult.error("主表id不能为空"); return AjaxResult.error("主表id不能为空");
} }
...@@ -465,8 +472,10 @@ public class SjGfjsBfzkhpjController extends BaseController ...@@ -465,8 +472,10 @@ public class SjGfjsBfzkhpjController extends BaseController
//问题描述 //问题描述
String wtms=new DataFormatter().formatCellValue(row.getCell(2)); String wtms=new DataFormatter().formatCellValue(row.getCell(2));
zsdwkhpj.setWtms(wtms); zsdwkhpj.setWtms(wtms);
String ldnr=new DataFormatter().formatCellValue(row.getCell(3));
zsdwkhpj.setLdnr(ldnr);
//考核分值 //考核分值
String khfz=new DataFormatter().formatCellValue(row.getCell(3)); String khfz=new DataFormatter().formatCellValue(row.getCell(4));
zsdwkhpj.setKhfz(khfz); zsdwkhpj.setKhfz(khfz);
list.add(zsdwkhpj); list.add(zsdwkhpj);
......
qianhe-ydsj/src/main/java/com/qianhe/controller/SjGfjsJcdwkhpjController.java
...@@ -187,6 +187,11 @@ public class SjGfjsJcdwkhpjController extends BaseController ...@@ -187,6 +187,11 @@ public class SjGfjsJcdwkhpjController extends BaseController
.map(SjGfjsZsdwwtcj::getWtmc).collect(Collectors.toList()); .map(SjGfjsZsdwwtcj::getWtmc).collect(Collectors.toList());
zsdwkhpj.setSj(collect.size()+""); zsdwkhpj.setSj(collect.size()+"");
zsdwkhpj.setWtms(String.join(";",collect)); zsdwkhpj.setWtms(String.join(";",collect));
//亮点合并
List<String> collect_ldnr = sjGfjsZsdwwtcjs.stream()
.filter(item -> item.getKhnr().equals(zsdwkhpj.getKhnr()) && item.getKhxd().equals(zsdwkhpj.getKhxd()))
.map(SjGfjsZsdwwtcj::getLdnr).collect(Collectors.toList());
zsdwkhpj.setLdnr(String.join(";",collect_ldnr));
addList.add(zsdwkhpj); addList.add(zsdwkhpj);
} }
...@@ -266,6 +271,7 @@ public class SjGfjsJcdwkhpjController extends BaseController ...@@ -266,6 +271,7 @@ public class SjGfjsJcdwkhpjController extends BaseController
Cell cell = row.createCell(m++);cell.setCellStyle(cellStyle); cell.setCellValue(zsdwkhpj.getKhnr()); Cell cell = row.createCell(m++);cell.setCellStyle(cellStyle); cell.setCellValue(zsdwkhpj.getKhnr());
cell = row.createCell(m++);cell.setCellStyle(cellStyle); cell.setCellValue(zsdwkhpj.getKhxd()); cell = row.createCell(m++);cell.setCellStyle(cellStyle); cell.setCellValue(zsdwkhpj.getKhxd());
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.getLdnr());
cell = row.createCell(m++);cell.setCellStyle(cellStyle); cell.setCellValue(zsdwkhpj.getKhfz()); 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.getId());
cell = row.createCell(m++);cell.setCellStyle(cellStyle); cell.setCellValue(zsdwkhpj.getZbId()); cell = row.createCell(m++);cell.setCellStyle(cellStyle); cell.setCellValue(zsdwkhpj.getZbId());
...@@ -426,13 +432,13 @@ public class SjGfjsJcdwkhpjController extends BaseController ...@@ -426,13 +432,13 @@ public class SjGfjsJcdwkhpjController extends BaseController
SjGfjsZsdwkhpj zsdwkhpj=new SjGfjsZsdwkhpj(); SjGfjsZsdwkhpj zsdwkhpj=new SjGfjsZsdwkhpj();
System.out.println(row); System.out.println(row);
//id //id
String id=new DataFormatter().formatCellValue(row.getCell(4)); String id=new DataFormatter().formatCellValue(row.getCell(5));
if(StringUtils.isEmpty(id)){ if(StringUtils.isEmpty(id)){
return AjaxResult.error("id不能为空"); return AjaxResult.error("id不能为空");
} }
zsdwkhpj.setId(Long.parseLong(id)); zsdwkhpj.setId(Long.parseLong(id));
//主表id //主表id
String zbid=new DataFormatter().formatCellValue(row.getCell(5)); String zbid=new DataFormatter().formatCellValue(row.getCell(6));
if(StringUtils.isEmpty(zbid)){ if(StringUtils.isEmpty(zbid)){
return AjaxResult.error("主表id不能为空"); return AjaxResult.error("主表id不能为空");
} }
...@@ -446,8 +452,11 @@ public class SjGfjsJcdwkhpjController extends BaseController ...@@ -446,8 +452,11 @@ public class SjGfjsJcdwkhpjController extends BaseController
//问题描述 //问题描述
String wtms=new DataFormatter().formatCellValue(row.getCell(2)); String wtms=new DataFormatter().formatCellValue(row.getCell(2));
zsdwkhpj.setWtms(wtms); zsdwkhpj.setWtms(wtms);
//亮点
String ldnr=new DataFormatter().formatCellValue(row.getCell(3));
zsdwkhpj.setLdnr(ldnr);
//考核分值 //考核分值
String khfz=new DataFormatter().formatCellValue(row.getCell(3)); String khfz=new DataFormatter().formatCellValue(row.getCell(4));
zsdwkhpj.setKhfz(khfz); zsdwkhpj.setKhfz(khfz);
list.add(zsdwkhpj); list.add(zsdwkhpj);
......
qianhe-ydsj/src/main/java/com/qianhe/controller/SjGfjsYdjcjlController.java
...@@ -186,6 +186,7 @@ public class SjGfjsYdjcjlController extends BaseController ...@@ -186,6 +186,7 @@ public class SjGfjsYdjcjlController extends BaseController
cell = row.createCell(m++);cell.setCellStyle(cellStyle); cell.setCellValue(tmp.getKhnr()); 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.getKhxd());
cell = row.createCell(m++);cell.setCellStyle(cellStyle); cell.setCellValue(tmp.getWtmc()); cell = row.createCell(m++);cell.setCellStyle(cellStyle); cell.setCellValue(tmp.getWtmc());
cell = row.createCell(m++);cell.setCellStyle(cellStyle); cell.setCellValue(tmp.getLdnr());
cell = row.createCell(m++);cell.setCellStyle(cellStyle); cell.setCellValue(tmp.getZgzrr()); 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.getZgcs());
cell = row.createCell(m++);cell.setCellStyle(cellStyle); cell.setCellValue(tmp.getZgqx()); cell = row.createCell(m++);cell.setCellStyle(cellStyle); cell.setCellValue(tmp.getZgqx());
...@@ -304,13 +305,16 @@ public class SjGfjsYdjcjlController extends BaseController ...@@ -304,13 +305,16 @@ public class SjGfjsYdjcjlController extends BaseController
zsdwwtcj.setWtmc(wtms); zsdwwtcj.setWtmc(wtms);
String zgzrr=new DataFormatter().formatCellValue(row.getCell(4)) ; String ldnr=new DataFormatter().formatCellValue(row.getCell(4)) ;
zsdwwtcj.setLdnr(ldnr);
String zgzrr=new DataFormatter().formatCellValue(row.getCell(5)) ;
zsdwwtcj.setZgzrr(zgzrr); zsdwwtcj.setZgzrr(zgzrr);
String zgcs=new DataFormatter().formatCellValue(row.getCell(5)) ; String zgcs=new DataFormatter().formatCellValue(row.getCell(6)) ;
zsdwwtcj.setZgcs(zgcs); zsdwwtcj.setZgcs(zgcs);
String zgqx=new DataFormatter().formatCellValue(row.getCell(6)) ; String zgqx=new DataFormatter().formatCellValue(row.getCell(7)) ;
zsdwwtcj.setZgqx(zgqx); zsdwwtcj.setZgqx(zgqx);
String zgzt=new DataFormatter().formatCellValue(row.getCell(7)) ; String zgzt=new DataFormatter().formatCellValue(row.getCell(8)) ;
zsdwwtcj.setZgzt(zgzt); zsdwwtcj.setZgzt(zgzt);
zsdwwtcj.setJcjb("基层单位自查"); zsdwwtcj.setJcjb("基层单位自查");
zsdwwtcj.setCreateTime(DateUtils.getNowDate()); zsdwwtcj.setCreateTime(DateUtils.getNowDate());
......
qianhe-ydsj/src/main/java/com/qianhe/controller/SjGfjsZsdwkhpjController.java
...@@ -175,6 +175,11 @@ public class SjGfjsZsdwkhpjController extends BaseController ...@@ -175,6 +175,11 @@ public class SjGfjsZsdwkhpjController extends BaseController
.map(SjGfjsZsdwwtcj::getWtmc).collect(Collectors.toList()); .map(SjGfjsZsdwwtcj::getWtmc).collect(Collectors.toList());
zsdwkhpj.setSj(collect.size()+""); zsdwkhpj.setSj(collect.size()+"");
zsdwkhpj.setWtms(String.join(";",collect)); zsdwkhpj.setWtms(String.join(";",collect));
//亮点合并
List<String> collect_ldnr = sjGfjsZsdwwtcjs.stream()
.filter(item -> item.getKhnr().equals(zsdwkhpj.getKhnr()) && item.getKhxd().equals(zsdwkhpj.getKhxd()))
.map(SjGfjsZsdwwtcj::getLdnr).collect(Collectors.toList());
zsdwkhpj.setLdnr(String.join(";",collect_ldnr));
addList.add(zsdwkhpj); addList.add(zsdwkhpj);
} }
...@@ -255,6 +260,7 @@ public class SjGfjsZsdwkhpjController extends BaseController ...@@ -255,6 +260,7 @@ public class SjGfjsZsdwkhpjController extends BaseController
Cell cell = row.createCell(m++);cell.setCellStyle(cellStyle); cell.setCellValue(zsdwkhpj.getKhnr()); Cell cell = row.createCell(m++);cell.setCellStyle(cellStyle); cell.setCellValue(zsdwkhpj.getKhnr());
cell = row.createCell(m++);cell.setCellStyle(cellStyle); cell.setCellValue(zsdwkhpj.getKhxd()); cell = row.createCell(m++);cell.setCellStyle(cellStyle); cell.setCellValue(zsdwkhpj.getKhxd());
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.getLdnr());
cell = row.createCell(m++);cell.setCellStyle(cellStyle); cell.setCellValue(zsdwkhpj.getKhfz()); 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.getId());
cell = row.createCell(m++);cell.setCellStyle(cellStyle); cell.setCellValue(zsdwkhpj.getZbId()); cell = row.createCell(m++);cell.setCellStyle(cellStyle); cell.setCellValue(zsdwkhpj.getZbId());
...@@ -415,13 +421,13 @@ public class SjGfjsZsdwkhpjController extends BaseController ...@@ -415,13 +421,13 @@ public class SjGfjsZsdwkhpjController extends BaseController
SjGfjsZsdwkhpj zsdwkhpj=new SjGfjsZsdwkhpj(); SjGfjsZsdwkhpj zsdwkhpj=new SjGfjsZsdwkhpj();
System.out.println(row); System.out.println(row);
//id //id
String id=new DataFormatter().formatCellValue(row.getCell(4)); String id=new DataFormatter().formatCellValue(row.getCell(5));
if(StringUtils.isEmpty(id)){ if(StringUtils.isEmpty(id)){
return AjaxResult.error("id不能为空"); return AjaxResult.error("id不能为空");
} }
zsdwkhpj.setId(Long.parseLong(id)); zsdwkhpj.setId(Long.parseLong(id));
//主表id //主表id
String zbid=new DataFormatter().formatCellValue(row.getCell(5)); String zbid=new DataFormatter().formatCellValue(row.getCell(6));
if(StringUtils.isEmpty(zbid)){ if(StringUtils.isEmpty(zbid)){
return AjaxResult.error("主表id不能为空"); return AjaxResult.error("主表id不能为空");
} }
...@@ -441,8 +447,10 @@ public class SjGfjsZsdwkhpjController extends BaseController ...@@ -441,8 +447,10 @@ public class SjGfjsZsdwkhpjController extends BaseController
//问题描述 //问题描述
String wtms=new DataFormatter().formatCellValue(row.getCell(2)); String wtms=new DataFormatter().formatCellValue(row.getCell(2));
zsdwkhpj.setWtms(wtms); zsdwkhpj.setWtms(wtms);
String ldnr=new DataFormatter().formatCellValue(row.getCell(3)) ;
zsdwkhpj.setLdnr(ldnr);
//考核分值 //考核分值
String khfz=new DataFormatter().formatCellValue(row.getCell(3)); String khfz=new DataFormatter().formatCellValue(row.getCell(4));
zsdwkhpj.setKhfz(khfz); zsdwkhpj.setKhfz(khfz);
list.add(zsdwkhpj); list.add(zsdwkhpj);
......
qianhe-ydsj/src/main/java/com/qianhe/domain/SjGfjsZsdwfjxcj.java
...@@ -39,7 +39,7 @@ public class SjGfjsZsdwfjxcj extends BaseEntity ...@@ -39,7 +39,7 @@ public class SjGfjsZsdwfjxcj extends BaseEntity
private String pjbzmc; private String pjbzmc;
/** 问题描述 */ /** 问题描述 */
@Excel(name = "问题描述") @Excel(name = "亮点与问题")
private String wtmc; private String wtmc;
/** 预留1 */ /** 预留1 */
......
qianhe-ydsj/src/main/java/com/qianhe/domain/SjGfjsZsdwkhpj.java
...@@ -56,6 +56,8 @@ public class SjGfjsZsdwkhpj extends BaseEntity ...@@ -56,6 +56,8 @@ public class SjGfjsZsdwkhpj extends BaseEntity
/** 问题描述 */ /** 问题描述 */
@Excel(name = "问题描述") @Excel(name = "问题描述")
private String wtms; private String wtms;
@Excel(name = "亮点")
private String ldnr;
/** 考核分值 */ /** 考核分值 */
@Excel(name = "考核结果") @Excel(name = "考核结果")
......
qianhe-ydsj/src/main/java/com/qianhe/domain/SjGfjsZsdwkhpjfjx.java
...@@ -49,7 +49,7 @@ public class SjGfjsZsdwkhpjfjx extends BaseEntity ...@@ -49,7 +49,7 @@ public class SjGfjsZsdwkhpjfjx extends BaseEntity
private String sffs; private String sffs;
/** 问题描述 */ /** 问题描述 */
@Excel(name = "问题描述") @Excel(name = "亮点与问题")
private String wtms; private String wtms;
/** 预留1 */ /** 预留1 */
......
qianhe-ydsj/src/main/java/com/qianhe/domain/SjGfjsZsdwwtcj.java
...@@ -28,8 +28,10 @@ public class SjGfjsZsdwwtcj extends BaseEntity ...@@ -28,8 +28,10 @@ public class SjGfjsZsdwwtcj extends BaseEntity
private String jcjb; private String jcjb;
/** 问题描述 */ /** 问题描述 */
@Excel(name = "问题描述") @Excel(name = "问题")
private String wtmc; private String wtmc;
@Excel(name = "亮点")
private String ldnr;
/** 考核内容 */ /** 考核内容 */
@Excel(name = "实施路径") @Excel(name = "实施路径")
......
qianhe-ydsj/src/main/resources/mapper/SjGfjsBfzjcMapper.xml
...@@ -30,6 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -30,6 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="yl5" column="yl5" /> <result property="yl5" column="yl5" />
<result property="deptName" column="dept_name" /> <result property="deptName" column="dept_name" />
<result property="deptLx" column="dept_lx" /> <result property="deptLx" column="dept_lx" />
<result property="ldnr" column="ldnr" />
</resultMap> </resultMap>
<sql id="selectSjGfjsZsdwwtcjVo"> <sql id="selectSjGfjsZsdwwtcjVo">
...@@ -58,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -58,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
a.yl5, a.yl5,
CONCAT(p.dept_name,'/',d.dept_name) dept_name, CONCAT(p.dept_name,'/',d.dept_name) dept_name,
d.dept_lx, d.dept_lx,
b.bfzmc as yl3name b.bfzmc as yl3name, a.ldnr
from sj_gfjs_zsdwwtcj a from sj_gfjs_zsdwwtcj a
left join sys_dept d on a.dept_id=d.dept_id left join sys_dept d on a.dept_id=d.dept_id
LEFT JOIN sys_dept p on d.parent_id = p.dept_id LEFT JOIN sys_dept p on d.parent_id = p.dept_id
...@@ -153,6 +154,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -153,6 +154,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="yl3 != null">yl3,</if> <if test="yl3 != null">yl3,</if>
<if test="yl4 != null">yl4,</if> <if test="yl4 != null">yl4,</if>
<if test="yl5 != null">yl5,</if> <if test="yl5 != null">yl5,</if>
<if test="ldnr != null">ldnr,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="deptId != null">#{deptId},</if> <if test="deptId != null">#{deptId},</if>
...@@ -177,13 +179,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -177,13 +179,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="yl3 != null">#{yl3},</if> <if test="yl3 != null">#{yl3},</if>
<if test="yl4 != null">#{yl4},</if> <if test="yl4 != null">#{yl4},</if>
<if test="yl5 != null">#{yl5},</if> <if test="yl5 != null">#{yl5},</if>
<if test="ldnr != null">#{ldnr},</if>
</trim> </trim>
</insert> </insert>
<insert id="batchSave"> <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) values 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, ldnr) values
<foreach item="item" index="index" collection="list" separator=","> <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.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.createBy}, #{item.createTime}, #{item.remark},#{item.yl1}, #{item.yl2}, #{item.yl3}, #{item.yl4}, #{item.yl5}, #{item.ldnr})
</foreach> </foreach>
</insert> </insert>
...@@ -212,6 +216,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -212,6 +216,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="yl3 != null">yl3 = #{yl3},</if> <if test="yl3 != null">yl3 = #{yl3},</if>
<if test="yl4 != null">yl4 = #{yl4},</if> <if test="yl4 != null">yl4 = #{yl4},</if>
<if test="yl5 != null">yl5 = #{yl5},</if> <if test="yl5 != null">yl5 = #{yl5},</if>
<if test="ldnr != null">ldnr = #{ldnr},</if>
</trim> </trim>
where id = #{id} where id = #{id}
</update> </update>
......
qianhe-ydsj/src/main/resources/mapper/SjGfjsYdjcjlMapper.xml
...@@ -55,6 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -55,6 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="yl4" column="sub_yl4" /> <result property="yl4" column="sub_yl4" />
<result property="yl5" column="sub_yl5" /> <result property="yl5" column="sub_yl5" />
<result property="pid" column="sub_pid" /> <result property="pid" column="sub_pid" />
<result property="ldnr" column="sub_ldnr" />
<result property="deptName" column="dept_name" /> <result property="deptName" column="dept_name" />
<result property="deptLx" column="dept_lx" /> <result property="deptLx" column="dept_lx" />
...@@ -130,7 +131,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -130,7 +131,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
b.zgzrr as sub_zgzrr, b.zgcs as sub_zgcs, b.zgqx as sub_zgqx, b.zgzt as sub_zgzt, 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.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.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.yl3 as sub_yl3, b.yl4 as sub_yl4, b.yl5 as sub_yl5, b.ldnr as sub_ldnr,
b.pid as sub_pid, d.dept_name, d.dept_lx b.pid as sub_pid, d.dept_name, d.dept_lx
from sj_gfjs_ydjcjl a from sj_gfjs_ydjcjl a
left join sj_gfjs_zsdwwtcj b on b.pid = a.id left join sj_gfjs_zsdwwtcj b on b.pid = a.id
...@@ -219,9 +220,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -219,9 +220,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
delete from sj_gfjs_zsdwwtcj where pid = #{pid} delete from sj_gfjs_zsdwwtcj where pid = #{pid}
</delete> </delete>
<insert id="batchSjGfjsZsdwwtcj"> <insert id="batchSjGfjsZsdwwtcj">
insert into sj_gfjs_zsdwwtcj( dept_id, rq, jcjb, wtmc, khnr, khxd, pjbzid, pjbzmc, zgzrr, zgcs, zgqx, zgzt, create_by, create_time, update_by, update_time, remark, yl1, yl2, yl3, yl4, yl5, pid) values insert into sj_gfjs_zsdwwtcj( dept_id, rq, jcjb, wtmc, khnr, khxd, pjbzid, pjbzmc, zgzrr, zgcs, zgqx, zgzt,
create_by, create_time, update_by, update_time, remark, yl1, yl2, yl3, yl4, yl5,
pid, ldnr) values
<foreach item="item" index="index" collection="list" separator=","> <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.updateBy}, #{item.updateTime}, #{item.remark}, #{item.yl1}, #{item.yl2}, #{item.yl3}, #{item.yl4}, #{item.yl5}, #{item.pid}) ( #{item.deptId}, #{item.rq}, #{item.jcjb}, #{item.wtmc}, #{item.khnr}, #{item.khxd}, #{item.pjbzid},
#{item.pjbzmc}, #{item.zgzrr}, #{item.zgcs}, #{item.zgqx}, #{item.zgzt}, #{item.createBy},
#{item.createTime}, #{item.updateBy}, #{item.updateTime}, #{item.remark}, #{item.yl1}, #{item.yl2},
#{item.yl3}, #{item.yl4}, #{item.yl5}, #{item.pid}, #{item.ldnr})
</foreach> </foreach>
</insert> </insert>
...@@ -253,6 +259,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -253,6 +259,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="yl5" column="yl5" /> <result property="yl5" column="yl5" />
<result property="deptName" column="dept_name" /> <result property="deptName" column="dept_name" />
<result property="deptLx" column="dept_lx" /> <result property="deptLx" column="dept_lx" />
<result property="ldnr" column="ldnr" />
</resultMap> </resultMap>
<select id="selectSjGfjsZsdwwtcjList" parameterType="SjGfjsZsdwwtcj" resultMap="SjGfjsZsdwwtcjResult2"> <select id="selectSjGfjsZsdwwtcjList" parameterType="SjGfjsZsdwwtcj" resultMap="SjGfjsZsdwwtcjResult2">
select id, select id,
...@@ -277,7 +284,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -277,7 +284,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
yl2, yl2,
yl3, yl3,
yl4, yl4,
yl5, d.dept_name,d.dept_lx yl5, d.dept_name,d.dept_lx,ldnr
from sj_gfjs_zsdwwtcj a from sj_gfjs_zsdwwtcj a
left join sys_dept d on a.dept_id=d.dept_id left join sys_dept d on a.dept_id=d.dept_id
<where> <where>
......
qianhe-ydsj/src/main/resources/mapper/SjGfjsZsdwkhpjMapper.xml
...@@ -30,6 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -30,6 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="yl4" column="yl4" /> <result property="yl4" column="yl4" />
<result property="yl5" column="yl5" /> <result property="yl5" column="yl5" />
<result property="deptName" column="dept_name" /> <result property="deptName" column="dept_name" />
<result property="ldnr" column="ldnr" />
</resultMap> </resultMap>
<sql id="selectSjGfjsZsdwkhpjVo"> <sql id="selectSjGfjsZsdwkhpjVo">
...@@ -56,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -56,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
a.yl2, a.yl2,
a.yl3, a.yl3,
a.yl4, a.yl4,
a.yl5,d.dept_name a.yl5,d.dept_name, a.ldnr
from sj_gfjs_zsdwkhpj a from sj_gfjs_zsdwkhpj a
left join sys_dept d on a.dept_id=d.dept_id left join sys_dept d on a.dept_id=d.dept_id
</sql> </sql>
...@@ -144,6 +145,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -144,6 +145,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="yl3 != null">yl3,</if> <if test="yl3 != null">yl3,</if>
<if test="yl4 != null">yl4,</if> <if test="yl4 != null">yl4,</if>
<if test="yl5 != null">yl5,</if> <if test="yl5 != null">yl5,</if>
<if test="ldnr != null">ldnr,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="zbId != null">#{zbId},</if> <if test="zbId != null">#{zbId},</if>
...@@ -169,12 +171,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -169,12 +171,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="yl3 != null">#{yl3},</if> <if test="yl3 != null">#{yl3},</if>
<if test="yl4 != null">#{yl4},</if> <if test="yl4 != null">#{yl4},</if>
<if test="yl5 != null">#{yl5},</if> <if test="yl5 != null">#{yl5},</if>
<if test="ldnr != null">#{ldnr},</if>
</trim> </trim>
</insert> </insert>
<insert id="batchSave"> <insert id="batchSave">
insert into sj_gfjs_zsdwkhpj( id, zb_id, dept_id, nd, zqfw, zqlx, jb, khnr, khxd, pjbzid, pjbzmc, sj, wtms, khfz, remark, yl1, yl2, yl3, yl4, yl5) values insert into sj_gfjs_zsdwkhpj( id, zb_id, dept_id, nd, zqfw, zqlx, jb, khnr, khxd, pjbzid, pjbzmc, sj, wtms,
khfz, remark, yl1, yl2, yl3, yl4, yl5, ldnr) values
<foreach item="item" index="index" collection="list" separator=","> <foreach item="item" index="index" collection="list" separator=",">
( #{item.id}, #{item.zbId}, #{item.deptId}, #{item.nd}, #{item.zqfw}, #{item.zqlx}, #{item.jb}, #{item.khnr}, #{item.khxd}, #{item.pjbzid}, #{item.pjbzmc}, #{item.sj}, #{item.wtms}, #{item.khfz}, #{item.remark}, #{item.yl1}, #{item.yl2}, #{item.yl3}, #{item.yl4}, #{item.yl5}) ( #{item.id}, #{item.zbId}, #{item.deptId}, #{item.nd}, #{item.zqfw}, #{item.zqlx}, #{item.jb},
#{item.khnr}, #{item.khxd}, #{item.pjbzid}, #{item.pjbzmc}, #{item.sj}, #{item.wtms}, #{item.khfz},
#{item.remark}, #{item.yl1}, #{item.yl2}, #{item.yl3}, #{item.yl4}, #{item.yl5}, #{item.ldnr})
</foreach> </foreach>
</insert> </insert>
...@@ -204,6 +210,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -204,6 +210,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="yl3 != null">yl3 = #{yl3},</if> <if test="yl3 != null">yl3 = #{yl3},</if>
<if test="yl4 != null">yl4 = #{yl4},</if> <if test="yl4 != null">yl4 = #{yl4},</if>
<if test="yl5 != null">yl5 = #{yl5},</if> <if test="yl5 != null">yl5 = #{yl5},</if>
<if test="ldnr != null">ldnr = #{ldnr},</if>
</trim> </trim>
where id = #{id} where id = #{id}
</update> </update>
...@@ -214,6 +221,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -214,6 +221,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="SET" suffixOverrides=","> <trim prefix="SET" suffixOverrides=",">
<if test="item.sj != null">sj = #{item.sj},</if> <if test="item.sj != null">sj = #{item.sj},</if>
<if test="item.wtms != null">wtms = #{item.wtms},</if> <if test="item.wtms != null">wtms = #{item.wtms},</if>
<if test="item.ldnr != null">ldnr = #{item.ldnr},</if>
<if test="item.khfz != null">khfz = #{item.khfz},</if> <if test="item.khfz != null">khfz = #{item.khfz},</if>
</trim> </trim>
where id = #{item.id} where id = #{item.id}
......
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