Skip to content

Q
qianhe-ydsj
Commit d9aa6d5f by wangqi
Options

机关部门-检查

parent f508ae10
Showing with 77 additions and 38 deletions
qianhe-ydsj/src/main/java/com/qianhe/controller/SjZdbfZsdwkhpjfjxController.java
......@@ -257,22 +257,22 @@ public class SjZdbfZsdwkhpjfjxController extends BaseController
SjZdbfZsdwkhpjfjx zsdwkhpj=new SjZdbfZsdwkhpjfjx();
System.out.println(row);
//id
String id=new DataFormatter().formatCellValue(row.getCell(7));
String id=new DataFormatter().formatCellValue(row.getCell(4));
if(StringUtils.isEmpty(id)){
return AjaxResult.error("id不能为空");
}
zsdwkhpj.setId(Long.parseLong(id));
//主表id
String zbid=new DataFormatter().formatCellValue(row.getCell(8));
String zbid=new DataFormatter().formatCellValue(row.getCell(5));
if(StringUtils.isEmpty(zbid)){
return AjaxResult.error("主表id不能为空");
}
zsdwkhpj.setZbId(Long.parseLong(zbid));
//是否发生
String sffs=new DataFormatter().formatCellValue(row.getCell(5));
String sffs=new DataFormatter().formatCellValue(row.getCell(2));
zsdwkhpj.setSffs(sffs);
//问题描述
String wtms=new DataFormatter().formatCellValue(row.getCell(6));
String wtms=new DataFormatter().formatCellValue(row.getCell(3));
zsdwkhpj.setWtms(wtms);
list.add(zsdwkhpj);
}
......
qianhe-ydsj/src/main/java/com/qianhe/controller/SjZdbfZsdwwtcjController.java
......@@ -12,6 +12,7 @@ import javax.servlet.http.HttpServletResponse;
import com.qianhe.common.core.domain.entity.SysDept;
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.SjZdbfKhpjbz;
import com.qianhe.domain.SjZdbfKhpjbzCb;
......@@ -275,6 +276,8 @@ public class SjZdbfZsdwwtcjController extends BaseController
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){
......
qianhe-ydsj/src/main/java/com/qianhe/controller/SjZdbfbfzjcController.java
......@@ -281,7 +281,9 @@ public class SjZdbfbfzjcController extends BaseController
zsdwwtcj.setZgqx(zgqx);
String zgzt=new DataFormatter().formatCellValue(row.getCell(10)) ;
zsdwwtcj.setZgzt(zgzt);
zsdwwtcj.setJcjb("基层单位自查");
zsdwwtcj.setJcjb("帮扶组检查");
zsdwwtcj.setCreateTime(DateUtils.getNowDate());
zsdwwtcj.setCreateBy(SecurityUtils.getUsername());
list.add(zsdwwtcj);
}
if(list.size()>0){
......
qianhe-ydsj/src/main/java/com/qianhe/controller/SjZdbfjgbmjcController.java
......@@ -8,6 +8,7 @@ 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.SjZdbfKhpjbzCb;
import com.qianhe.domain.SjZdbfZsdwwtcj;
......@@ -77,7 +78,7 @@ public class SjZdbfjgbmjcController extends BaseController
OutputStream out = null;
InputStream in = null;
try {
in =this.getClass().getResourceAsStream("/static/zsdwwtcj.xlsx");
in =this.getClass().getResourceAsStream("/static/jgbmwtjc.xlsx");
exl = WorkbookFactory.create(in);
out = response.getOutputStream();
response.reset();
......@@ -191,46 +192,75 @@ public class SjZdbfjgbmjcController extends BaseController
return AjaxResult.error("导入失败，第"+(i+1)+"行日期格式错误");
}
zsdwwtcj.setRq(DateUtils.parseDateToStr("yyyy-MM",date));
//单位
String dw=new DataFormatter().formatCellValue(row.getCell(2)) ;
//机关部门
String jgbm=new DataFormatter().formatCellValue(row.getCell(2)) ;
if(StringUtils.isEmpty(jgbm)){
return AjaxResult.error("导入失败，第"+(i+1)+"行机关部门不能为空");
}
String[] jgsplit = jgbm.split("/");
if(jgsplit.length==1){
String bm=jgsplit[0]; // 部门
SysDept bmdept = deptList.stream().filter(dept -> dept.getDeptName().equals(bm)).findFirst().orElse(null);
if(bmdept==null){
return AjaxResult.error("导入失败，第"+(i+1)+"行，机关部门：未匹配到机关名称");
}
zsdwwtcj.setYl3(bmdept.getDeptId());
}else{
String bm=jgsplit[0];// 部门
String ks=jgsplit[1];// 科室
SysDept bmdept = deptList.stream().filter(dept -> dept.getDeptName().equals(bm)).findFirst().orElse(null);
if(bmdept==null){
return AjaxResult.error("导入失败，第"+(i+1)+"行，机关部门：未匹配到机关名称");
}
SysDept ksdept = deptList.stream().filter(dept -> dept.getDeptName().equals(ks) && dept.getParentId().equals(bmdept.getDeptId())).findFirst().orElse(null);
if(ksdept==null){
return AjaxResult.error("导入失败，第"+(i+1)+"行，机关部门：未匹配到科室名称");
}
zsdwwtcj.setYl3(ksdept.getDeptId());
}
//受检单位
String dw=new DataFormatter().formatCellValue(row.getCell(3)) ;
if(StringUtils.isEmpty(dw)){
return AjaxResult.error("导入失败，第"+(i+1)+"行单位不能为空");
return AjaxResult.error("导入失败，第"+(i+1)+"行受检单位不能为空");
}
//查询单位id
//查询受检单位id
String[] split = dw.split("/");
if(split.length<2){
return AjaxResult.error("导入失败，第"+(i+1)+"行输入的单位格式有误!");
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)+"行未匹配到二级单位");
return AjaxResult.error("导入失败，第"+(i+1)+"行，受检单位：未匹配到二级单位");
}
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)+"行未匹配到三级单位");
return AjaxResult.error("导入失败，第"+(i+1)+"行，受检单位：未匹配到三级单位");
}
zsdwwtcj.setDeptId(sjdept.getDeptId());
//问题描述
String wtms=new DataFormatter().formatCellValue(row.getCell(3)) ;
String wtms=new DataFormatter().formatCellValue(row.getCell(4)) ;
if(StringUtils.isEmpty(wtms)){
return AjaxResult.error("导入失败，第"+(i+1)+"行问题描述不能为空");
}
zsdwwtcj.setWtmc(wtms);
//考核内容
String khnr=new DataFormatter().formatCellValue(row.getCell(4)) ;
String khnr=new DataFormatter().formatCellValue(row.getCell(5)) ;
if(StringUtils.isEmpty(khnr)){
return AjaxResult.error("导入失败，第"+(i+1)+"行考核内容不能为空");
}
zsdwwtcj.setKhnr(khnr);
//考核项点
String khxd=new DataFormatter().formatCellValue(row.getCell(5)) ;
String khxd=new DataFormatter().formatCellValue(row.getCell(6)) ;
if(StringUtils.isEmpty(khxd)){
return AjaxResult.error("导入失败，第"+(i+1)+"行考核项点不能为空");
}
zsdwwtcj.setKhxd(khxd);
String pjbz=new DataFormatter().formatCellValue(row.getCell(6)) ;
String pjbz=new DataFormatter().formatCellValue(row.getCell(7)) ;
if(StringUtils.isEmpty(pjbz)){
return AjaxResult.error("导入失败，第"+(i+1)+"行评价标准不能为空");
}
......@@ -252,15 +282,17 @@ public class SjZdbfjgbmjcController extends BaseController
}
zsdwwtcj.setPjbzid(cb.getId()+"");
zsdwwtcj.setPjbzmc(cb.getPjbz());
String zgzrr=new DataFormatter().formatCellValue(row.getCell(7)) ;
String zgzrr=new DataFormatter().formatCellValue(row.getCell(8)) ;
zsdwwtcj.setZgzrr(zgzrr);
String zgcs=new DataFormatter().formatCellValue(row.getCell(8)) ;
String zgcs=new DataFormatter().formatCellValue(row.getCell(9)) ;
zsdwwtcj.setZgcs(zgcs);
String zgqx=new DataFormatter().formatCellValue(row.getCell(9)) ;
String zgqx=new DataFormatter().formatCellValue(row.getCell(10)) ;
zsdwwtcj.setZgqx(zgqx);
String zgzt=new DataFormatter().formatCellValue(row.getCell(10)) ;
String zgzt=new DataFormatter().formatCellValue(row.getCell(11)) ;
zsdwwtcj.setZgzt(zgzt);
zsdwwtcj.setJcjb("基层单位自查");
zsdwwtcj.setJcjb("机关部门检查");
zsdwwtcj.setCreateTime(DateUtils.getNowDate());
zsdwwtcj.setCreateBy(SecurityUtils.getUsername());
list.add(zsdwwtcj);
}
if(list.size()>0){
......
qianhe-ydsj/src/main/java/com/qianhe/controller/SjZdbfndkhpjfjxController.java
......@@ -249,22 +249,22 @@ public class SjZdbfndkhpjfjxController extends BaseController
SjZdbfZsdwkhpjfjx zsdwkhpj=new SjZdbfZsdwkhpjfjx();
System.out.println(row);
//id
String id=new DataFormatter().formatCellValue(row.getCell(7));
String id=new DataFormatter().formatCellValue(row.getCell(4));
if(StringUtils.isEmpty(id)){
return AjaxResult.error("id不能为空");
}
zsdwkhpj.setId(Long.parseLong(id));
//主表id
String zbid=new DataFormatter().formatCellValue(row.getCell(8));
String zbid=new DataFormatter().formatCellValue(row.getCell(5));
if(StringUtils.isEmpty(zbid)){
return AjaxResult.error("主表id不能为空");
}
zsdwkhpj.setZbId(Long.parseLong(zbid));
//是否发生
String sffs=new DataFormatter().formatCellValue(row.getCell(5));
String sffs=new DataFormatter().formatCellValue(row.getCell(2));
zsdwkhpj.setSffs(sffs);
//问题描述
String wtms=new DataFormatter().formatCellValue(row.getCell(6));
String wtms=new DataFormatter().formatCellValue(row.getCell(3));
zsdwkhpj.setWtms(wtms);
list.add(zsdwkhpj);
}
......
qianhe-ydsj/src/main/java/com/qianhe/domain/SjZdbfZsdwfjxcj.java
......@@ -54,7 +54,7 @@ public class SjZdbfZsdwfjxcj extends BaseEntity
/** 预留3 */
@Excel(name = "预留3")
private String yl3;
private Long yl3;
/** 预留4 */
@Excel(name = "预留4")
......@@ -72,5 +72,7 @@ public class SjZdbfZsdwfjxcj extends BaseEntity
private String deptLx;
private String yl3name;
}
qianhe-ydsj/src/main/java/com/qianhe/service/impl/SjZdbfZsdwkhpjServiceImpl.java
......@@ -150,7 +150,7 @@ public class SjZdbfZsdwkhpjServiceImpl implements ISjZdbfZsdwkhpjService
sjZdbfZsdwkhpjZb.setDjyjkfs(new BigDecimal(kf));
//扣分比列
BigDecimal df = sjZdbfZsdwkhpjZb.getDjyjzfs().add(new BigDecimal(kf));
BigDecimal kfbl =df.divide(sjZdbfZsdwkhpjZb.getDjyjzfs(),BigDecimal.ROUND_CEILING).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
BigDecimal kfbl =df.divide(sjZdbfZsdwkhpjZb.getDjyjzfs(),4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
sjZdbfZsdwkhpjZb.setDjyjkfbl(new BigDecimal(100).subtract(kfbl));
//得分
sjZdbfZsdwkhpjZb.setDjyjdf(df);
......@@ -161,7 +161,7 @@ public class SjZdbfZsdwkhpjServiceImpl implements ISjZdbfZsdwkhpjService
sjZdbfZsdwkhpjZb.setSztskfs(new BigDecimal(kf));
//扣分比列
BigDecimal df = sjZdbfZsdwkhpjZb.getSztszfs().add(new BigDecimal(kf));
BigDecimal kfbl =df.divide(sjZdbfZsdwkhpjZb.getSztszfs(),BigDecimal.ROUND_CEILING).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
BigDecimal kfbl =df.divide(sjZdbfZsdwkhpjZb.getSztszfs(),4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
sjZdbfZsdwkhpjZb.setSztsfbl(new BigDecimal(100).subtract(kfbl));
//得分
sjZdbfZsdwkhpjZb.setSztsdf(df);
......@@ -169,7 +169,7 @@ public class SjZdbfZsdwkhpjServiceImpl implements ISjZdbfZsdwkhpjService
sjZdbfZsdwkhpjZb.setGlgfkfs(new BigDecimal(kf));
//扣分比列
BigDecimal df = sjZdbfZsdwkhpjZb.getGlgfzfs().add(new BigDecimal(kf));
BigDecimal kfbl =df.divide(sjZdbfZsdwkhpjZb.getGlgfzfs(),BigDecimal.ROUND_CEILING).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
BigDecimal kfbl =df.divide(sjZdbfZsdwkhpjZb.getGlgfzfs(),4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
sjZdbfZsdwkhpjZb.setGlgfbl(new BigDecimal(100).subtract(kfbl));
//得分
sjZdbfZsdwkhpjZb.setGlgfdf(df);
......@@ -177,7 +177,7 @@ public class SjZdbfZsdwkhpjServiceImpl implements ISjZdbfZsdwkhpjService
sjZdbfZsdwkhpjZb.setYwcxkfs(new BigDecimal(kf));
//扣分比列
BigDecimal df = sjZdbfZsdwkhpjZb.getYwcxzfs().add(new BigDecimal(kf));
BigDecimal kfbl =df.divide(sjZdbfZsdwkhpjZb.getYwcxzfs(),BigDecimal.ROUND_CEILING).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
BigDecimal kfbl =df.divide(sjZdbfZsdwkhpjZb.getYwcxzfs(),4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
sjZdbfZsdwkhpjZb.setYwcxbl(new BigDecimal(100).subtract(kfbl));
//得分
sjZdbfZsdwkhpjZb.setYwcxdf(df);
......@@ -192,7 +192,7 @@ public class SjZdbfZsdwkhpjServiceImpl implements ISjZdbfZsdwkhpjService
//总扣分
sjZdbfZsdwkhpjZb.setZkf(sum.subtract(sunfs));
//总扣分比例
BigDecimal bigDecimal = sunfs.divide(sum,BigDecimal.ROUND_CEILING).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
BigDecimal bigDecimal = sunfs.divide(sum,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
sjZdbfZsdwkhpjZb.setZkfbl(new BigDecimal(100).subtract(bigDecimal));
//综合得分
String deptDfl = dept.getDeptDfl();
......
qianhe-ydsj/src/main/java/com/qianhe/service/impl/SjZdbfjgbmjcServiceImpl.java
......@@ -45,7 +45,7 @@ public class SjZdbfjgbmjcServiceImpl implements ISjZdbfjgbmjcService
* @return 指导帮扶-机关部门检查
*/
@Override
@DataScope(deptAlias = "d")
@DataScope(deptAlias = "c")
public List<SjZdbfZsdwwtcj> selectSjZdbfZsdwwtcjList(SjZdbfZsdwwtcj sjZdbfZsdwwtcj)
{
return sjZdbfJcdwwtcjMapper.selectSjZdbfZsdwwtcjList(sjZdbfZsdwwtcj);
......
qianhe-ydsj/src/main/java/com/qianhe/service/impl/SjZdbfndkhpjServiceImpl.java
......@@ -152,7 +152,7 @@ public class SjZdbfndkhpjServiceImpl implements ISjZdbfndkhpjService
sjZdbfZsdwkhpjZb.setDjyjkfs(new BigDecimal(kf));
//扣分比列
BigDecimal df = sjZdbfZsdwkhpjZb.getDjyjzfs().add(new BigDecimal(kf));
BigDecimal kfbl =df.divide(sjZdbfZsdwkhpjZb.getDjyjzfs(),BigDecimal.ROUND_CEILING).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
BigDecimal kfbl =df.divide(sjZdbfZsdwkhpjZb.getDjyjzfs(),4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
sjZdbfZsdwkhpjZb.setDjyjkfbl(new BigDecimal(100).subtract(kfbl));
//得分
sjZdbfZsdwkhpjZb.setDjyjdf(df);
......@@ -163,7 +163,7 @@ public class SjZdbfndkhpjServiceImpl implements ISjZdbfndkhpjService
sjZdbfZsdwkhpjZb.setSztskfs(new BigDecimal(kf));
//扣分比列
BigDecimal df = sjZdbfZsdwkhpjZb.getSztszfs().add(new BigDecimal(kf));
BigDecimal kfbl =df.divide(sjZdbfZsdwkhpjZb.getSztszfs(),BigDecimal.ROUND_CEILING).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
BigDecimal kfbl =df.divide(sjZdbfZsdwkhpjZb.getSztszfs(),4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
sjZdbfZsdwkhpjZb.setSztsfbl(new BigDecimal(100).subtract(kfbl));
//得分
sjZdbfZsdwkhpjZb.setSztsdf(df);
......@@ -171,7 +171,7 @@ public class SjZdbfndkhpjServiceImpl implements ISjZdbfndkhpjService
sjZdbfZsdwkhpjZb.setGlgfkfs(new BigDecimal(kf));
//扣分比列
BigDecimal df = sjZdbfZsdwkhpjZb.getGlgfzfs().add(new BigDecimal(kf));
BigDecimal kfbl =df.divide(sjZdbfZsdwkhpjZb.getGlgfzfs(),BigDecimal.ROUND_CEILING).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
BigDecimal kfbl =df.divide(sjZdbfZsdwkhpjZb.getGlgfzfs(),4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
sjZdbfZsdwkhpjZb.setGlgfbl(new BigDecimal(100).subtract(kfbl));
//得分
sjZdbfZsdwkhpjZb.setGlgfdf(df);
......@@ -179,7 +179,7 @@ public class SjZdbfndkhpjServiceImpl implements ISjZdbfndkhpjService
sjZdbfZsdwkhpjZb.setYwcxkfs(new BigDecimal(kf));
//扣分比列
BigDecimal df = sjZdbfZsdwkhpjZb.getYwcxzfs().add(new BigDecimal(kf));
BigDecimal kfbl =df.divide(sjZdbfZsdwkhpjZb.getYwcxzfs(),BigDecimal.ROUND_CEILING).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
BigDecimal kfbl =df.divide(sjZdbfZsdwkhpjZb.getYwcxzfs(),4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
sjZdbfZsdwkhpjZb.setYwcxbl(new BigDecimal(100).subtract(kfbl));
//得分
sjZdbfZsdwkhpjZb.setYwcxdf(df);
......@@ -194,7 +194,7 @@ public class SjZdbfndkhpjServiceImpl implements ISjZdbfndkhpjService
//总扣分
sjZdbfZsdwkhpjZb.setZkf(sum.subtract(sunfs));
//总扣分比例
BigDecimal bigDecimal = sunfs.divide(sum,BigDecimal.ROUND_CEILING).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
BigDecimal bigDecimal = sunfs.divide(sum,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
sjZdbfZsdwkhpjZb.setZkfbl(new BigDecimal(100).subtract(bigDecimal));
//综合得分
String deptDfl = dept.getDeptDfl();
......
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