ljf
/
shuili
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

4.3任务提交

master
zth 2 weeks ago
parent
36406ab946
commit
9b2e0275ed
8 changed files with 120 additions and 54 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 32
      shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfAqrwController.java
  2. 8
      shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfAqrwService.java
  3. 23
      shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzAqrwController.java
  4. 5
      shuili-system/src/main/java/com/kms/yg/sz/domain/dto/AqrwDto.java
  5. 4
      shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzAqrwMapper.java
  6. 16
      shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzAqrwService.java
  7. 39
      shuili-system/src/main/resources/mapper/yg/df/BsSgcDfAqrwMapper.xml
  8. 47
      shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzAqrwMapper.xml

32
shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfAqrwController.java
View File

@ -1,5 +1,6 @@
package com.kms.yg.df.controller;
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@ -8,11 +9,20 @@ import com.kms.common.utils.UserUtils;
import com.kms.system.domain.SysXzqh;
import com.kms.system.service.SysDeptService;
import com.kms.system.service.SysXzqhService;
import com.kms.yg.df.domain.BsSgcDfAqjc;
import com.kms.yg.df.domain.BsSgcDfAqjdxx;
import com.kms.yg.df.domain.BsSgcDfAqrw;
import com.kms.yg.df.domain.BsSgcDfDfrw;
import com.kms.yg.df.service.BsSgcDfAqjcService;
import com.kms.yg.df.service.BsSgcDfAqjdxxService;
import com.kms.yg.df.service.BsSgcDfAqrwService;
import com.kms.yg.df.service.BsSgcDfDfrwService;
import com.kms.yg.sz.domain.BsSgcSzAqjc;
import com.kms.yg.sz.domain.BsSgcSzAqjdxx;
import com.kms.yg.sz.domain.BsSgcSzSzrw;
import com.kms.yg.sz.domain.dto.AqrwDto;
import com.kms.yg.sz.service.BsSgcSzAqjcService;
import com.kms.yg.sz.service.BsSgcSzAqjdxxService;
import com.shuili.common.annotation.Log;
import com.shuili.common.core.controller.BaseController;
import com.shuili.common.core.domain.AjaxResult;
@ -51,9 +61,13 @@ public class BsSgcDfAqrwController extends BaseController
private SysDeptService sysDeptService;
@Autowired
private BsSgcDfDfrwService bsSgcDfDfrwService;
private BsSgcDfDfrwService bsSgcDfrwService;
@Autowired
private BsSgcDfAqjdxxService bsSgcDfAqjdxxService;
@Autowired
private BsSgcDfAqjcService bsSgcDfAqjcService;
@GetMapping("/getLevel/{taskId}")
public AjaxResult getLevel(@PathVariable String taskId) {
@ -203,9 +217,21 @@ public class BsSgcDfAqrwController extends BaseController
public AjaxResult remove(@PathVariable String[] ids)
{
for (String id:ids){
LambdaQueryWrapper<BsSgcDfDfrw>lw=new LambdaQueryWrapper<>();
LambdaQueryWrapper<BsSgcDfDfrw> lw=new LambdaQueryWrapper<>();
lw.eq(BsSgcDfDfrw::getTaskId,id);
bsSgcDfDfrwService.remove(lw);
List<BsSgcDfDfrw> list = bsSgcDfrwService.list(lw);
if(CollectionUtil.isNotEmpty(list)) {
for (BsSgcDfDfrw dfrw:list) {
LambdaQueryWrapper<BsSgcDfAqjdxx> jdxxLw = new LambdaQueryWrapper<>();
jdxxLw.eq(BsSgcDfAqjdxx::getDfrwId,dfrw.getId());
bsSgcDfAqjdxxService.remove(jdxxLw);
LambdaQueryWrapper<BsSgcDfAqjc>aqjcLw=new LambdaQueryWrapper<>();
aqjcLw.eq(BsSgcDfAqjc::getDfrwId,dfrw.getId());
bsSgcDfAqjcService.remove(aqjcLw);
}
}
bsSgcDfrwService.remove(lw);
}
return toAjax(bsSgcSzAqrwService.removeByIds(Arrays.asList(ids)));
}

8
shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfAqrwService.java
View File

@ -192,25 +192,25 @@ public class BsSgcDfAqrwService extends BaseService<BsSgcDfAqrwMapper, BsSgcDfAq
AqrwDto aqrwDto = new AqrwDto();
aqrwDto.setAdcdName(numDto.getName());
for (NumDto dto : zeroNum) {
if (ObjectUtil.isNotNull(dto) &&StringUtils.isNotNull(dto.getName())) {
if (ObjectUtil.isNotNull(dto) &&StringUtils.isNotNull(dto.getName())&&dto.getName().equals(numDto.getName())) {
aqrwDto.setZeroNum(dto.getNum());
}
}
for (NumDto dto : oneNum) {
if (ObjectUtil.isNotNull(dto) && StringUtils.isNotNull(dto.getName())) {
if (ObjectUtil.isNotNull(dto) && StringUtils.isNotNull(dto.getName())&&dto.getName().equals(numDto.getName())) {
aqrwDto.setOneNum(dto.getNum());
}
}
for (NumDto dto : twoNum) {
if (ObjectUtil.isNotNull(dto) &&StringUtils.isNotNull(dto.getName())) {
if (ObjectUtil.isNotNull(dto) &&StringUtils.isNotNull(dto.getName())&&dto.getName().equals(numDto.getName())) {
aqrwDto.setTwoNum(dto.getNum());
}
}
for (NumDto dto : threeNum) {
if (ObjectUtil.isNotNull(dto) &&StringUtils.isNotNull(dto.getName())) {
if (ObjectUtil.isNotNull(dto) &&StringUtils.isNotNull(dto.getName())&&dto.getName().equals(numDto.getName())) {
aqrwDto.setThreeNum(dto.getNum());
}
}

23
shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzAqrwController.java
View File

@ -1,5 +1,6 @@
package com.kms.yg.sz.controller;
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@ -8,9 +9,13 @@ import com.kms.common.utils.UserUtils;
import com.kms.system.domain.SysXzqh;
import com.kms.system.service.SysDeptService;
import com.kms.system.service.SysXzqhService;
import com.kms.yg.sz.domain.BsSgcSzAqjc;
import com.kms.yg.sz.domain.BsSgcSzAqjdxx;
import com.kms.yg.sz.domain.BsSgcSzAqrw;
import com.kms.yg.sz.domain.BsSgcSzSzrw;
import com.kms.yg.sz.domain.dto.AqrwDto;
import com.kms.yg.sz.service.BsSgcSzAqjcService;
import com.kms.yg.sz.service.BsSgcSzAqjdxxService;
import com.kms.yg.sz.service.BsSgcSzAqrwService;
import com.kms.yg.sz.service.BsSgcSzSzrwService;
import com.shuili.common.annotation.Log;
@ -53,6 +58,12 @@ public class BsSgcSzAqrwController extends BaseController
@Autowired
private BsSgcSzSzrwService bsSgcSzSzrwService;
@Autowired
private BsSgcSzAqjdxxService bsSgcSzAqjdxxService;
@Autowired
private BsSgcSzAqjcService bsSgcSzAqjcService;
@GetMapping("/getLevel/{taskId}")
public AjaxResult getLevel(@PathVariable String taskId) {
@ -204,6 +215,18 @@ public class BsSgcSzAqrwController extends BaseController
for (String id:ids){
LambdaQueryWrapper<BsSgcSzSzrw> lw=new LambdaQueryWrapper<>();
lw.eq(BsSgcSzSzrw::getTaskId,id);
List<BsSgcSzSzrw> list = bsSgcSzSzrwService.list(lw);
if(CollectionUtil.isNotEmpty(list)) {
for (BsSgcSzSzrw szrw:list) {
LambdaQueryWrapper<BsSgcSzAqjdxx> jdxxLw = new LambdaQueryWrapper<>();
jdxxLw.eq(BsSgcSzAqjdxx::getSzrwId,szrw.getId());
bsSgcSzAqjdxxService.remove(jdxxLw);
LambdaQueryWrapper<BsSgcSzAqjc>aqjcLw=new LambdaQueryWrapper<>();
aqjcLw.eq(BsSgcSzAqjc::getSzrwId,szrw.getId());
bsSgcSzAqjcService.remove(aqjcLw);
}
}
bsSgcSzSzrwService.remove(lw);
}
return toAjax(bsSgcSzAqrwService.removeByIds(Arrays.asList(ids)));

5
shuili-system/src/main/java/com/kms/yg/sz/domain/dto/AqrwDto.java
View File

@ -25,6 +25,8 @@ public class AqrwDto {
private int three;
private int four;
private String rate;
public void setTotal() {
@ -32,6 +34,7 @@ public class AqrwDto {
}
public void setRate() {
this.rate = String.valueOf(this.threeNum/this.total);
Double i = Double.valueOf(this.threeNum) / Double.valueOf(this.total);
this.rate = String.valueOf(i);
}
}

4
shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzAqrwMapper.java
View File

@ -51,6 +51,10 @@ public interface BsSgcSzAqrwMapper extends BaseMapper<BsSgcSzAqrw> {
@Param("layer") Integer layer,
@Param("taskId") String taskId);
List<NumDto> getFour(@Param("adcd") String subString,
@Param("layer") Integer layer,
@Param("taskId") String taskId);
Map<String,Integer> getStatistics(@Param("startDate") String startDate,@Param("endDate")String endDate,
@Param("adcd")String xzqh,@Param("layer")String layer);

16
shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzAqrwService.java
View File

@ -187,27 +187,28 @@ public class BsSgcSzAqrwService extends BaseService<BsSgcSzAqrwMapper, BsSgcSzAq
for (NumDto numDto : Num) {
AqrwDto aqrwDto = new AqrwDto();
aqrwDto.setAdcdName(numDto.getName());
for (NumDto dto : zeroNum) {
if (ObjectUtil.isNotNull(dto) &&StringUtils.isNotBlank(dto.getName())) {
if (ObjectUtil.isNotNull(dto) &&StringUtils.isNotBlank(dto.getName())&&dto.getName().equals(numDto.getName())) {
aqrwDto.setZeroNum(dto.getNum());
}
}
for (NumDto dto : oneNum) {
if (ObjectUtil.isNotNull(dto) &&StringUtils.isNotBlank(dto.getName())) {
if (ObjectUtil.isNotNull(dto) &&StringUtils.isNotBlank(dto.getName())&&dto.getName().equals(numDto.getName())) {
aqrwDto.setOneNum(dto.getNum());
}
}
for (NumDto dto : twoNum) {
if (ObjectUtil.isNotNull(dto) &&StringUtils.isNotBlank(dto.getName())) {
if (ObjectUtil.isNotNull(dto) &&StringUtils.isNotBlank(dto.getName())&&dto.getName().equals(numDto.getName())) {
aqrwDto.setTwoNum(dto.getNum());
}
}
for (NumDto dto : threeNum) {
if (ObjectUtil.isNotNull(dto) &&StringUtils.isNotBlank(dto.getName())) {
if (ObjectUtil.isNotNull(dto) &&StringUtils.isNotBlank(dto.getName())&&dto.getName().equals(numDto.getName())) {
aqrwDto.setThreeNum(dto.getNum());
}
}
@ -240,6 +241,7 @@ public class BsSgcSzAqrwService extends BaseService<BsSgcSzAqrwMapper, BsSgcSzAq
List<NumDto> one = bsSgcSzAqrwMapper.getOne(sysXzqhService.getSubString(adcd), layer,taskId);
List<NumDto> two = bsSgcSzAqrwMapper.getTwo(sysXzqhService.getSubString(adcd), layer,taskId);
List<NumDto> three = bsSgcSzAqrwMapper.getThree(sysXzqhService.getSubString(adcd), layer,taskId);
List<NumDto> four = bsSgcSzAqrwMapper.getFour(sysXzqhService.getSubString(adcd), layer,taskId);
for (AqrwDto aqrwDto : dtoList) {
@ -262,6 +264,12 @@ public class BsSgcSzAqrwService extends BaseService<BsSgcSzAqrwMapper, BsSgcSzAq
}
}
for (NumDto numDto : four) {
if (StringUtils.isNotBlank(numDto.getName())&&numDto.getName().equals(aqrwDto.getAdcdName())) {
aqrwDto.setFour(numDto.getNum());
}
}
}

39
shuili-system/src/main/resources/mapper/yg/df/BsSgcDfAqrwMapper.xml
View File

@ -13,6 +13,15 @@
</sql>
<sql id="infoJdxx">
SELECT sx.`NAME`,
COUNT(1) num
FROM bs_sgc_df_dfrw ss
LEFT JOIN bs_sgc_df_aqjdxx jdxx on jdxx.dfrw_id =ss.ID
LEFT JOIN att_dike_base sj ON sj.dike_code = ss.dike_code
LEFT JOIN sys_xzqh sx ON sj.adcd = LEFT(sx.XZQHDM,6) AND RIGHT(sx.XZQHDM, 6) = '000000'
</sql>
<resultMap id="NumDto" type="NumDto">
<result property="name" column="name"/>
@ -70,34 +79,22 @@
<select id="getOne" resultMap="NumDto">
<include refid="info"></include>
where task_id =#{taskId} and sj.`security_category`="0"
<if test="layer==1">
<include refid="infoJdxx"></include>
where task_id =#{taskId} and jdxx.`security_category`="0"
GROUP BY LEFT(sj.adcd,4)
</if>
<if test="layer==2">
GROUP BY sj.adcd
</if>
</select>
<select id="getTwo" resultMap="NumDto">
<include refid="info"></include>
where task_id =#{taskId} and sj.`security_category`="1"
<if test="layer==1">
<include refid="infoJdxx"></include>
where task_id =#{taskId} and jdxx.`security_category`="1"
GROUP BY LEFT(sj.adcd,4)
</if>
<if test="layer==2">
GROUP BY sj.adcd
</if>
</select>
<select id="getThree" resultMap="NumDto">
<include refid="info"></include>
where task_id =#{taskId} and sj.`security_category`="2"
<if test="layer==1">
<include refid="infoJdxx"></include>
where task_id =#{taskId} and jdxx.`security_category`="2"
GROUP BY LEFT(sj.adcd,4)
</if>
<if test="layer==2">
GROUP BY sj.adcd
</if>
</select>
<select id="getStatistics" resultType="Map">

47
shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzAqrwMapper.xml
View File

@ -14,6 +14,15 @@
</sql>
<sql id="infoAdjxx">
SELECT sx.`NAME`,
COUNT(1) num
FROM bs_sgc_sz_szrw ss
LEFT JOIN bs_sgc_sz_aqjdxx jdxx on ss.ID=jdxx.szrw_id
LEFT JOIN att_waga_base sj ON sj.waga_code = ss.waga_code
LEFT JOIN sys_xzqh sx ON LEFT(sj.adcd,6) = LEFT(sx.XZQHDM,6)
AND RIGHT(sx.xzqhdm, 6) = '000000'
</sql>
<resultMap id="NumDto" type="NumDto">
<result property="name" column="name"/>
@ -70,36 +79,32 @@
<select id="getOne" resultMap="NumDto">
<include refid="info"></include>
where task_id =#{taskId} and sj.`security_category`="0"
<if test="layer==1">
<include refid="infoAdjxx"></include>
where task_id =#{taskId} and jdxx.`security_category`=0
GROUP BY LEFT(sj.adcd,4)
</if>
<if test="layer==2">
GROUP BY sj.adcd
</if>
</select>
<select id="getTwo" resultMap="NumDto">
<include refid="info"></include>
where task_id =#{taskId} and sj.`security_category`="1"
<if test="layer==1">
<include refid="infoAdjxx"></include>
where task_id =#{taskId} and jdxx.`security_category`=1
GROUP BY LEFT(sj.adcd,4)
</if>
<if test="layer==2">
GROUP BY sj.adcd
</if>
</select>
<select id="getThree" resultMap="NumDto">
<include refid="info"></include>
where task_id =#{taskId} and sj.`security_category`="2"
<if test="layer==1">
<include refid="infoAdjxx"></include>
where task_id =#{taskId} and jdxx.`security_category`=2
GROUP BY LEFT(sj.adcd,4)
</if>
<if test="layer==2">
GROUP BY sj.adcd
</if>
</select>
<select id="getFour" resultMap="NumDto">
<include refid="infoAdjxx"></include>
where task_id =#{taskId} and jdxx.`security_category`=3
GROUP BY LEFT(sj.adcd,4)
</select>
<select id="getStatistics" resultType="Map">
SELECT COUNT(1) num,
COUNT(CASE WHEN ss.status = '3' THEN 1 END) completedNum,

Write Preview
Loading…
Cancel
Save