Skip to content

Q
qianhe-ydsj
Commit c18a616f by MMF
Options

MMF 2026-03-24 项目抽检模块新增zsrwid

parent c242dac1
Showing with 122 additions and 50 deletions
qianhe-ydsj/src/main/java/com/qianhe/zqcz/xmrylsjl/domain/ZqczXmRyLsjl.java
...@@ -27,6 +27,10 @@ public class ZqczXmRyLsjl extends BaseEntity { ...@@ -27,6 +27,10 @@ public class ZqczXmRyLsjl extends BaseEntity {
*/ */
private Long xmryid; private Long xmryid;
/** /**
* 基层任务ID：关联zqcz_zsrw.zsrwid
*/
private Long zsrwid;
/**
* 基层任务ID：关联zqcz_jcrw.jcrwid * 基层任务ID：关联zqcz_jcrw.jcrwid
*/ */
private Long jcrwid; private Long jcrwid;
...@@ -101,7 +105,8 @@ public class ZqczXmRyLsjl extends BaseEntity { ...@@ -101,7 +105,8 @@ public class ZqczXmRyLsjl extends BaseEntity {
*/ */
private String yl5; private String yl5;
public ZqczXmRyLsjl(Long jcrwid, Long jcdwid, ZqczRyxxVo ryxxVo, ZqczXmglVo xmglVo) { public ZqczXmRyLsjl(Long zsrwid, Long jcrwid, Long jcdwid, ZqczRyxxVo ryxxVo, ZqczXmglVo xmglVo) {
this.zsrwid = zsrwid;
this.jcrwid = jcrwid; this.jcrwid = jcrwid;
this.jcdwid = jcdwid; this.jcdwid = jcdwid;
this.xmmc = xmglVo.getXmmc(); this.xmmc = xmglVo.getXmmc();
...@@ -114,4 +119,19 @@ public class ZqczXmRyLsjl extends BaseEntity { ...@@ -114,4 +119,19 @@ public class ZqczXmRyLsjl extends BaseEntity {
this.update_by = SecurityUtils.getLoginUser().getUsername(); this.update_by = SecurityUtils.getLoginUser().getUsername();
this.create_time = new Date(); this.create_time = new Date();
} }
public ZqczXmRyLsjl(Long zsrwid, Long jcrwid, Long jcdwid, ZqczXmglVo bzhczXmglVo, String dwmc, String rymc){
this.zsrwid = zsrwid;
this.jcrwid = jcrwid;
this.jcdwid = jcdwid;
this.xmmc = bzhczXmglVo.getXmmc();
this.xmzy = bzhczXmglVo.getXmzy();
this.xmlb = bzhczXmglVo.getXmlb();
this.gzcj = bzhczXmglVo.getGzcj();
this.rymc = rymc;
this.dwmc = dwmc;
this.create_by = SecurityUtils.getLoginUser().getUsername();
this.update_by = SecurityUtils.getLoginUser().getUsername();
this.create_time = new Date();
}
} }
qianhe-ydsj/src/main/java/com/qianhe/zqcz/xmrylsjl/domain/ZqczXmRyLsjlQuery.java
...@@ -19,6 +19,10 @@ import java.util.Date; ...@@ -19,6 +19,10 @@ import java.util.Date;
public class ZqczXmRyLsjlQuery extends BaseEntity { public class ZqczXmRyLsjlQuery extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* 基层任务ID：关联zqcz_zsrw.zsrwid
*/
private Long zsrwid;
/**
* 基层任务ID：关联 zqcz_jcrw.jcrwid * 基层任务ID：关联 zqcz_jcrw.jcrwid
*/ */
private Long jcrwid; private Long jcrwid;
......
qianhe-ydsj/src/main/java/com/qianhe/zqcz/xmrylsjl/domain/ZqczXmRyLsjlVo.java
...@@ -26,6 +26,11 @@ public class ZqczXmRyLsjlVo implements Serializable { ...@@ -26,6 +26,11 @@ public class ZqczXmRyLsjlVo implements Serializable {
private Long xmryid; private Long xmryid;
/** /**
* 基层任务ID：关联zqcz_zsrw.zsrwid
*/
private Long zsrwid;
/**
* 基层任务ID：关联zqcz_jcrw.jcrwid * 基层任务ID：关联zqcz_jcrw.jcrwid
*/ */
private Long jcrwid; private Long jcrwid;
......
qianhe-ydsj/src/main/java/com/qianhe/zqcz/xmrylsjl/mapper/ZqczXmRyLsjlMapper.java
...@@ -46,4 +46,9 @@ public interface ZqczXmRyLsjlMapper { ...@@ -46,4 +46,9 @@ public interface ZqczXmRyLsjlMapper {
*/ */
int deleteByJcrwid(@Param("jcrwid") Long jcrwid); int deleteByJcrwid(@Param("jcrwid") Long jcrwid);
/**
* 根据直属任务ID 删除
*/
int deleteByZsrwid(@Param("zsrwid") Long zsrwid);
} }
qianhe-ydsj/src/main/java/com/qianhe/zqcz/xmrylsjl/service/impl/ZqczXmRyLsjlServiceImpl.java
...@@ -57,6 +57,9 @@ public class ZqczXmRyLsjlServiceImpl implements ZqczXmRyLsjlService { ...@@ -57,6 +57,9 @@ public class ZqczXmRyLsjlServiceImpl implements ZqczXmRyLsjlService {
* @param zqczXmRyLsjlQuery * @param zqczXmRyLsjlQuery
*/ */
private void spotCheckAddCheck(ZqczXmRyLsjlQuery zqczXmRyLsjlQuery) { private void spotCheckAddCheck(ZqczXmRyLsjlQuery zqczXmRyLsjlQuery) {
if (zqczXmRyLsjlQuery.getZsrwid() == null) {
throw new BusinessException("直属任务ID不能为空");
}
if (zqczXmRyLsjlQuery.getJcrwid() == null) { if (zqczXmRyLsjlQuery.getJcrwid() == null) {
throw new BusinessException("基层任务ID不能为空"); throw new BusinessException("基层任务ID不能为空");
} }
...@@ -81,6 +84,7 @@ public class ZqczXmRyLsjlServiceImpl implements ZqczXmRyLsjlService { ...@@ -81,6 +84,7 @@ public class ZqczXmRyLsjlServiceImpl implements ZqczXmRyLsjlService {
spotCheckAddCheck(zqczXmRyLsjlQuery); spotCheckAddCheck(zqczXmRyLsjlQuery);
// 项目字段 // 项目字段
Long zsrwid = zqczXmRyLsjlQuery.getZsrwid(); // 直属任务ID
Long jcrwid = zqczXmRyLsjlQuery.getJcrwid(); // 基层任务ID Long jcrwid = zqczXmRyLsjlQuery.getJcrwid(); // 基层任务ID
Long jcdwid = zqczXmRyLsjlQuery.getJcdwid(); // 基层单位ID Long jcdwid = zqczXmRyLsjlQuery.getJcdwid(); // 基层单位ID
String xmzy = zqczXmRyLsjlQuery.getXmzy(); // 项目专业 1-采油 2-集输 String xmzy = zqczXmRyLsjlQuery.getXmzy(); // 项目专业 1-采油 2-集输
...@@ -143,37 +147,37 @@ public class ZqczXmRyLsjlServiceImpl implements ZqczXmRyLsjlService { ...@@ -143,37 +147,37 @@ public class ZqczXmRyLsjlServiceImpl implements ZqczXmRyLsjlService {
if (ZqczXmzyEnum.CAIYOU_ZHUANYE.getCode().equals(xmzy)) { // 采油专业 项目抽取 if (ZqczXmzyEnum.CAIYOU_ZHUANYE.getCode().equals(xmzy)) { // 采油专业 项目抽取
// 5. 处理 个人应急项目（从领导班子中抽取一人、抽三室一中心抽取两人、从班站中抽取一人） 先抽人，在抽项目 // 5. 处理 个人应急项目（从领导班子中抽取一人、抽三室一中心抽取两人、从班站中抽取一人） 先抽人，在抽项目
List<ZqczXmRyLsjl> finalCyGryjxmList = spotCheckCyGryjxm(jcrwid, jcdwid, ldbzRyxxList, ssyzxRyxxList, desigRyxxList, gryjXmglList); List<ZqczXmRyLsjl> finalCyGryjxmList = spotCheckCyGryjxm(zsrwid, jcrwid, jcdwid, ldbzRyxxList, ssyzxRyxxList, desigRyxxList, gryjXmglList);
if (!Optional.ofNullable(finalCyGryjxmList).orElse(Collections.emptyList()).isEmpty()) { if (!Optional.ofNullable(finalCyGryjxmList).orElse(Collections.emptyList()).isEmpty()) {
finalList.addAll(finalCyGryjxmList); finalList.addAll(finalCyGryjxmList);
} }
// 6. 处理 标准化操作项目 （根据项目人数从班站中随机抽取指定人数）先抽项目，在抽人 // 6. 处理 标准化操作项目 （根据项目人数从班站中随机抽取指定人数）先抽项目，在抽人
ZqczXmRyLsjl finalCyBzhczxm = spotCheckCyBzhczxm(jcrwid, jcdwid, desigRyxxList, drsrXmglList, tdczXmglList); ZqczXmRyLsjl finalCyBzhczxm = spotCheckCyBzhczxm(zsrwid, jcrwid, jcdwid, desigRyxxList, drsrXmglList, tdczXmglList);
if (finalCyBzhczxm != null) { if (finalCyBzhczxm != null) {
finalList.add(finalCyBzhczxm); finalList.add(finalCyBzhczxm);
} }
// 7. 处理 团队应急项目（从领导班子中抽取一人、抽三室一中心抽取两人、在根据剩余项目人数从班站中抽取）先抽项目，在抽人 // 7. 处理 团队应急项目（从领导班子中抽取一人、抽三室一中心抽取两人、在根据剩余项目人数从班站中抽取）先抽项目，在抽人
ZqczXmRyLsjl finalCjTdyjxm = spotCheckCyTdyjxm(jcrwid, jcdwid, ldbzRyxxList, ssyzxRyxxList, desigRyxxList, tdyjXmglList); ZqczXmRyLsjl finalCjTdyjxm = spotCheckCyTdyjxm(zsrwid, jcrwid, jcdwid, ldbzRyxxList, ssyzxRyxxList, desigRyxxList, tdyjXmglList);
if (finalCjTdyjxm != null) { if (finalCjTdyjxm != null) {
finalList.add(finalCjTdyjxm); finalList.add(finalCjTdyjxm);
} }
} else { // 集输专业 项目抽取 } else { // 集输专业 项目抽取
// 1. 抽检个人应急项目（从领导班子中抽取一人、抽三室一中心抽取两人、从选中的3个班站中各抽取一人） 先抽人，在抽项目 // 1. 抽检个人应急项目（从领导班子中抽取一人、抽三室一中心抽取两人、从选中的3个班站中各抽取一人） 先抽人，在抽项目
List<ZqczXmRyLsjl> finalJsGryjxmList = spotCheckJsGryjxm(jcrwid, jcdwid, ldbzRyxxList, ssyzxRyxxList, desigRyxxList, gryjXmglList); List<ZqczXmRyLsjl> finalJsGryjxmList = spotCheckJsGryjxm(zsrwid, jcrwid, jcdwid, ldbzRyxxList, ssyzxRyxxList, desigRyxxList, gryjXmglList);
if (!Optional.ofNullable(finalJsGryjxmList).orElse(Collections.emptyList()).isEmpty()) { if (!Optional.ofNullable(finalJsGryjxmList).orElse(Collections.emptyList()).isEmpty()) {
finalList.addAll(finalJsGryjxmList); finalList.addAll(finalJsGryjxmList);
} }
// 2. 抽检 标准化操作项目（从选中的3个班站中各抽取2人） 先抽人，在抽项目 // 2. 抽检 标准化操作项目（从选中的3个班站中各抽取2人） 先抽人，在抽项目
List<ZqczXmRyLsjl> finalJsBzhczxmList = spotCheckJsBzhczxm(jcrwid, jcdwid, desigRyxxList, drsrXmglList, tdczXmglList); List<ZqczXmRyLsjl> finalJsBzhczxmList = spotCheckJsBzhczxm(zsrwid, jcrwid, jcdwid, desigRyxxList, drsrXmglList, tdczXmglList);
if (!Optional.ofNullable(finalJsBzhczxmList).orElse(Collections.emptyList()).isEmpty()) { if (!Optional.ofNullable(finalJsBzhczxmList).orElse(Collections.emptyList()).isEmpty()) {
finalList.addAll(finalJsBzhczxmList); finalList.addAll(finalJsBzhczxmList);
} }
// 3. 抽检 团队应急项目 （第一个班站从领导班子中抽取一人、抽三室一中心抽取一人、班站成员自行选择，默认情况下选择所有的班站成员，其余班站随机抽取项目，班站人员默认全部） // 3. 抽检 团队应急项目 （第一个班站从领导班子中抽取一人、抽三室一中心抽取一人、班站成员自行选择，默认情况下选择所有的班站成员，其余班站随机抽取项目，班站人员默认全部）
List<ZqczXmRyLsjl> finalJsTdyjxmList = spotCheckJsTdyjxm(jcrwid, jcdwid, ldbzRyxxList, ssyzxRyxxList, desigRyxxList, tdyjXmglList); List<ZqczXmRyLsjl> finalJsTdyjxmList = spotCheckJsTdyjxm(zsrwid, jcrwid, jcdwid, ldbzRyxxList, ssyzxRyxxList, desigRyxxList, tdyjXmglList);
if (!Optional.ofNullable(finalJsTdyjxmList).orElse(Collections.emptyList()).isEmpty()) { if (!Optional.ofNullable(finalJsTdyjxmList).orElse(Collections.emptyList()).isEmpty()) {
finalList.addAll(finalJsTdyjxmList); finalList.addAll(finalJsTdyjxmList);
} }
...@@ -184,8 +188,17 @@ public class ZqczXmRyLsjlServiceImpl implements ZqczXmRyLsjlService { ...@@ -184,8 +188,17 @@ public class ZqczXmRyLsjlServiceImpl implements ZqczXmRyLsjlService {
/** /**
* 抽检 个人应急项目（采油） * 抽检 个人应急项目（采油）
*
* @param zsrwid 直属任务ID
* @param jcrwid 基层任务ID
* @param jcdwid 基层单位ID
* @param ldbzRyxxList 领导班子 人员信息
* @param ssyzxRyxxList 三室一中心 人员信息
* @param desigRyxxList 抽取指定班站 人员信息
* @param gryjXmglList 个人应急项目
* @return
*/ */
private List<ZqczXmRyLsjl> spotCheckCyGryjxm(Long jcrwid, Long jcdwid, List<ZqczRyxxVo> ldbzRyxxList, List<ZqczRyxxVo> ssyzxRyxxList, List<ZqczRyxxVo> desigRyxxList, List<ZqczXmglVo> gryjXmglList) { private List<ZqczXmRyLsjl> spotCheckCyGryjxm(Long zsrwid, Long jcrwid, Long jcdwid, List<ZqczRyxxVo> ldbzRyxxList, List<ZqczRyxxVo> ssyzxRyxxList, List<ZqczRyxxVo> desigRyxxList, List<ZqczXmglVo> gryjXmglList) {
List<ZqczXmRyLsjl> dataList = new ArrayList<>(); List<ZqczXmRyLsjl> dataList = new ArrayList<>();
ZqczRyxxVo lockldbzRyxxVo = null; // 锁定 领导班子 ZqczRyxxVo lockldbzRyxxVo = null; // 锁定 领导班子
...@@ -213,17 +226,17 @@ public class ZqczXmRyLsjlServiceImpl implements ZqczXmRyLsjlService { ...@@ -213,17 +226,17 @@ public class ZqczXmRyLsjlServiceImpl implements ZqczXmRyLsjlService {
if (!Optional.ofNullable(gryjXmglList).orElse(Collections.emptyList()).isEmpty()) { if (!Optional.ofNullable(gryjXmglList).orElse(Collections.emptyList()).isEmpty()) {
if (lockldbzRyxxVo != null) { if (lockldbzRyxxVo != null) {
ZqczXmglVo lockldbzXmgl = MtUtils.getRandomList(gryjXmglList, 1).get(0); // 领导班子 锁定项目 ZqczXmglVo lockldbzXmgl = MtUtils.getRandomList(gryjXmglList, 1).get(0); // 领导班子 锁定项目
dataList.add(new ZqczXmRyLsjl(jcrwid, jcdwid, lockldbzRyxxVo, lockldbzXmgl)); dataList.add(new ZqczXmRyLsjl(zsrwid, jcrwid, jcdwid, lockldbzRyxxVo, lockldbzXmgl));
} }
if (!Optional.ofNullable(spotLdbzList).orElse(Collections.emptyList()).isEmpty()) { if (!Optional.ofNullable(spotLdbzList).orElse(Collections.emptyList()).isEmpty()) {
for (ZqczRyxxVo zqczRyxxVo : spotLdbzList) { for (ZqczRyxxVo zqczRyxxVo : spotLdbzList) {
ZqczXmglVo lockssyzxXmgl = MtUtils.getRandomList(gryjXmglList, 1).get(0); // 三室一中心 锁定项目 ZqczXmglVo lockssyzxXmgl = MtUtils.getRandomList(gryjXmglList, 1).get(0); // 三室一中心 锁定项目
dataList.add(new ZqczXmRyLsjl(jcrwid, jcdwid, zqczRyxxVo, lockssyzxXmgl)); dataList.add(new ZqczXmRyLsjl(zsrwid, jcrwid, jcdwid, zqczRyxxVo, lockssyzxXmgl));
} }
} }
if (lockbzRyxxVo != null) { if (lockbzRyxxVo != null) {
ZqczXmglVo lockbzXmgl = MtUtils.getRandomList(gryjXmglList, 1).get(0); // 班站 锁定项目 ZqczXmglVo lockbzXmgl = MtUtils.getRandomList(gryjXmglList, 1).get(0); // 班站 锁定项目
dataList.add(new ZqczXmRyLsjl(jcrwid, jcdwid, lockbzRyxxVo, lockbzXmgl)); dataList.add(new ZqczXmRyLsjl(zsrwid, jcrwid, jcdwid, lockbzRyxxVo, lockbzXmgl));
} }
} }
return dataList; return dataList;
...@@ -231,8 +244,16 @@ public class ZqczXmRyLsjlServiceImpl implements ZqczXmRyLsjlService { ...@@ -231,8 +244,16 @@ public class ZqczXmRyLsjlServiceImpl implements ZqczXmRyLsjlService {
/** /**
* 抽检 标准化操作项目（采油） * 抽检 标准化操作项目（采油）
*
* @param zsrwid 直属任务ID
* @param jcrwid 基层任务ID
* @param jcdwid 基层单位ID
* @param desigRyxxList 抽取指定班站 人员信息
* @param drsrXmglList 单人/双人操作项目
* @param tdczXmglList 团队操作项目
* @return
*/ */
private ZqczXmRyLsjl spotCheckCyBzhczxm(Long jcrwid, Long jcdwid, List<ZqczRyxxVo> desigRyxxList, List<ZqczXmglVo> drsrXmglList, List<ZqczXmglVo> tdczXmglList) { private ZqczXmRyLsjl spotCheckCyBzhczxm(Long zsrwid, Long jcrwid, Long jcdwid, List<ZqczRyxxVo> desigRyxxList, List<ZqczXmglVo> drsrXmglList, List<ZqczXmglVo> tdczXmglList) {
// 合并单人/双人操作项目，团队操作项目 // 合并单人/双人操作项目，团队操作项目
List<ZqczXmglVo> bzhczXmglList = new ArrayList<>(); List<ZqczXmglVo> bzhczXmglList = new ArrayList<>();
if (!Optional.ofNullable(drsrXmglList).orElse(Collections.emptyList()).isEmpty()) { if (!Optional.ofNullable(drsrXmglList).orElse(Collections.emptyList()).isEmpty()) {
...@@ -258,26 +279,23 @@ public class ZqczXmRyLsjlServiceImpl implements ZqczXmRyLsjlService { ...@@ -258,26 +279,23 @@ public class ZqczXmRyLsjlServiceImpl implements ZqczXmRyLsjlService {
String dwmc = finalList.stream().map(ZqczRyxxVo::getDwmc).distinct().collect(Collectors.joining(",")); String dwmc = finalList.stream().map(ZqczRyxxVo::getDwmc).distinct().collect(Collectors.joining(","));
String rymc = finalList.stream().map(ZqczRyxxVo::getRymc).distinct().collect(Collectors.joining(",")); String rymc = finalList.stream().map(ZqczRyxxVo::getRymc).distinct().collect(Collectors.joining(","));
ZqczXmRyLsjl xmRyLsjl = ZqczXmRyLsjl.builder() ZqczXmRyLsjl xmRyLsjl = new ZqczXmRyLsjl(zsrwid, jcrwid, jcdwid, bzhczXmglVo, rymc, dwmc);
.jcrwid(jcrwid)
.jcdwid(jcdwid)
.xmmc(bzhczXmglVo.getXmmc())
.xmzy(bzhczXmglVo.getXmzy())
.xmlb(bzhczXmglVo.getXmlb())
.gzcj(bzhczXmglVo.getGzcj())
.rymc(rymc)
.dwmc(dwmc)
.create_by(SecurityUtils.getLoginUser().getUsername())
.update_by(SecurityUtils.getLoginUser().getUsername())
.create_time(new Date())
.build();
return xmRyLsjl; return xmRyLsjl;
} }
/** /**
* 抽检 团队应急项目（采油） * 抽检 团队应急项目（采油）
*
* @param zsrwid 直属任务ID
* @param jcrwid 基层任务ID
* @param jcdwid 基层单位ID
* @param ldbzRyxxList 领导班子 人员信息
* @param ssyzxRyxxList 三室一中心 人员信息
* @param desigRyxxList 抽取指定班站 人员信息
* @param tdyjXmglList 团队应急项目
* @return
*/ */
private ZqczXmRyLsjl spotCheckCyTdyjxm(Long jcrwid, Long jcdwid, List<ZqczRyxxVo> ldbzRyxxList, List<ZqczRyxxVo> ssyzxRyxxList, List<ZqczRyxxVo> desigRyxxList, List<ZqczXmglVo> tdyjXmglList) { private ZqczXmRyLsjl spotCheckCyTdyjxm(Long zsrwid, Long jcrwid, Long jcdwid, List<ZqczRyxxVo> ldbzRyxxList, List<ZqczRyxxVo> ssyzxRyxxList, List<ZqczRyxxVo> desigRyxxList, List<ZqczXmglVo> tdyjXmglList) {
// 抽检项目 // 抽检项目
if (Optional.ofNullable(tdyjXmglList).orElse(Collections.emptyList()).isEmpty()) { if (Optional.ofNullable(tdyjXmglList).orElse(Collections.emptyList()).isEmpty()) {
return null; return null;
...@@ -325,9 +343,18 @@ public class ZqczXmRyLsjlServiceImpl implements ZqczXmRyLsjlService { ...@@ -325,9 +343,18 @@ public class ZqczXmRyLsjlServiceImpl implements ZqczXmRyLsjlService {
/** /**
* 抽检 个人应急项目（集输） * 抽检 个人应急项目（集输）
*
* @param zsrwid 直属任务ID
* @param jcrwid 基层任务ID
* @param jcdwid 基层单位ID
* @param ldbzRyxxList 领导班子 人员信息
* @param ssyzxRyxxList 三室一中心 人员信息
* @param desigRyxxList 抽取指定班站 人员信息
* @param gryjXmglList 个人应急项目
* @return
*/ */
private List<ZqczXmRyLsjl> spotCheckJsGryjxm(Long jcrwid, Long jcdwid, List<ZqczRyxxVo> ldbzRyxxList, List<ZqczRyxxVo> ssyzxRyxxList, List<ZqczRyxxVo> desigRyxxList, List<ZqczXmglVo> gryjXmglList) { private List<ZqczXmRyLsjl> spotCheckJsGryjxm(Long zsrwid, Long jcrwid, Long jcdwid, List<ZqczRyxxVo> ldbzRyxxList, List<ZqczRyxxVo> ssyzxRyxxList, List<ZqczRyxxVo> desigRyxxList, List<ZqczXmglVo> gryjXmglList) {
List<ZqczXmRyLsjl> dataList = new ArrayList<>(); List<ZqczXmRyLsjl> dataList = new ArrayList<>();
ZqczRyxxVo lockldbzRyxxVo = null; // 锁定 领导班子 ZqczRyxxVo lockldbzRyxxVo = null; // 锁定 领导班子
if (!Optional.ofNullable(ldbzRyxxList).orElse(Collections.emptyList()).isEmpty()) { if (!Optional.ofNullable(ldbzRyxxList).orElse(Collections.emptyList()).isEmpty()) {
...@@ -356,18 +383,18 @@ public class ZqczXmRyLsjlServiceImpl implements ZqczXmRyLsjlService { ...@@ -356,18 +383,18 @@ public class ZqczXmRyLsjlServiceImpl implements ZqczXmRyLsjlService {
if (!Optional.ofNullable(gryjXmglList).orElse(Collections.emptyList()).isEmpty()) { if (!Optional.ofNullable(gryjXmglList).orElse(Collections.emptyList()).isEmpty()) {
if (lockldbzRyxxVo != null) { if (lockldbzRyxxVo != null) {
ZqczXmglVo lockldbzXmgl = MtUtils.getRandomList(gryjXmglList, 1).get(0); // 领导班子 锁定项目 ZqczXmglVo lockldbzXmgl = MtUtils.getRandomList(gryjXmglList, 1).get(0); // 领导班子 锁定项目
dataList.add(new ZqczXmRyLsjl(jcrwid, jcdwid, lockldbzRyxxVo, lockldbzXmgl)); dataList.add(new ZqczXmRyLsjl(zsrwid, jcrwid, jcdwid, lockldbzRyxxVo, lockldbzXmgl));
} }
if (!Optional.ofNullable(spotLdbzList).orElse(Collections.emptyList()).isEmpty()) { if (!Optional.ofNullable(spotLdbzList).orElse(Collections.emptyList()).isEmpty()) {
for (ZqczRyxxVo zqczRyxxVo : spotLdbzList) { for (ZqczRyxxVo zqczRyxxVo : spotLdbzList) {
ZqczXmglVo lockssyzxXmgl = MtUtils.getRandomList(gryjXmglList, 1).get(0); // 三室一中心 锁定项目 ZqczXmglVo lockssyzxXmgl = MtUtils.getRandomList(gryjXmglList, 1).get(0); // 三室一中心 锁定项目
dataList.add(new ZqczXmRyLsjl(jcrwid, jcdwid, zqczRyxxVo, lockssyzxXmgl)); dataList.add(new ZqczXmRyLsjl(zsrwid, jcrwid, jcdwid, zqczRyxxVo, lockssyzxXmgl));
} }
} }
if (!Optional.ofNullable(spotbzList).orElse(Collections.emptyList()).isEmpty()) { if (!Optional.ofNullable(spotbzList).orElse(Collections.emptyList()).isEmpty()) {
for (ZqczRyxxVo zqczRyxxVo : spotbzList) { for (ZqczRyxxVo zqczRyxxVo : spotbzList) {
ZqczXmglVo lockbzXmgl = MtUtils.getRandomList(gryjXmglList, 1).get(0); // 班站 锁定项目 ZqczXmglVo lockbzXmgl = MtUtils.getRandomList(gryjXmglList, 1).get(0); // 班站 锁定项目
dataList.add(new ZqczXmRyLsjl(jcrwid, jcdwid, zqczRyxxVo, lockbzXmgl)); dataList.add(new ZqczXmRyLsjl(zsrwid, jcrwid, jcdwid, zqczRyxxVo, lockbzXmgl));
} }
} }
} }
...@@ -376,8 +403,16 @@ public class ZqczXmRyLsjlServiceImpl implements ZqczXmRyLsjlService { ...@@ -376,8 +403,16 @@ public class ZqczXmRyLsjlServiceImpl implements ZqczXmRyLsjlService {
/** /**
* 抽检 标准化操作项目（集输） * 抽检 标准化操作项目（集输）
*
* @param zsrwid 直属任务ID
* @param jcrwid 基层任务ID
* @param jcdwid 基层单位ID
* @param desigRyxxList 抽取指定班站 人员信息
* @param drsrXmglList 单人/双人操作项目
* @param tdczXmglList 团队操作项目
* @return
*/ */
private List<ZqczXmRyLsjl> spotCheckJsBzhczxm(Long jcrwid, Long jcdwid, List<ZqczRyxxVo> desigRyxxList, List<ZqczXmglVo> drsrXmglList, List<ZqczXmglVo> tdczXmglList) { private List<ZqczXmRyLsjl> spotCheckJsBzhczxm(Long zsrwid, Long jcrwid, Long jcdwid, List<ZqczRyxxVo> desigRyxxList, List<ZqczXmglVo> drsrXmglList, List<ZqczXmglVo> tdczXmglList) {
List<ZqczXmRyLsjl> dataList = new ArrayList<>(); List<ZqczXmRyLsjl> dataList = new ArrayList<>();
// 合并单人/双人操作项目，团队操作项目 // 合并单人/双人操作项目，团队操作项目
...@@ -415,25 +450,26 @@ public class ZqczXmRyLsjlServiceImpl implements ZqczXmRyLsjlService { ...@@ -415,25 +450,26 @@ public class ZqczXmRyLsjlServiceImpl implements ZqczXmRyLsjlService {
if (!Optional.ofNullable(spotbzList).orElse(Collections.emptyList()).isEmpty()) { if (!Optional.ofNullable(spotbzList).orElse(Collections.emptyList()).isEmpty()) {
for (ZqczRyxxVo zqczRyxxVo : spotbzList) { for (ZqczRyxxVo zqczRyxxVo : spotbzList) {
ZqczXmglVo lockbzXmgl = MtUtils.getRandomList(bzhczXmglList, 1).get(0); // 班站 锁定项目 ZqczXmglVo lockbzXmgl = MtUtils.getRandomList(bzhczXmglList, 1).get(0); // 班站 锁定项目
dataList.add(new ZqczXmRyLsjl(jcrwid, jcdwid, zqczRyxxVo, lockbzXmgl)); dataList.add(new ZqczXmRyLsjl(zsrwid, jcrwid, jcdwid, zqczRyxxVo, lockbzXmgl));
} }
} }
} }
return dataList; return dataList;
} }
/** /**
* 抽检 团队应急项目（集输） * 抽检 团队应急项目（集输）
* *
* @param zsrwid 直属任务ID
* @param jcrwid 基层任务ID * @param jcrwid 基层任务ID
* @param jcdwid 基层单位ID * @param jcdwid 基层单位ID
* @param ldbzRyxxList 领导班子 人员信息 * @param ldbzRyxxList 领导班子 人员信息
* @param ssyzxRyxxList 三室一中心 人员信息 * @param ssyzxRyxxList 三室一中心 人员信息
* @param desigRyxxList 指定班站 人员信息 * @param desigRyxxList 抽取指定班站 人员信息
* @param tdyjXmglList 团队应急项目 * @param tdyjXmglList 团队应急项目
* @return * @return
*/ */
private List<ZqczXmRyLsjl> spotCheckJsTdyjxm(Long jcrwid, Long jcdwid, List<ZqczRyxxVo> ldbzRyxxList, List<ZqczRyxxVo> ssyzxRyxxList, List<ZqczRyxxVo> desigRyxxList, List<ZqczXmglVo> tdyjXmglList) { private List<ZqczXmRyLsjl> spotCheckJsTdyjxm(Long zsrwid, Long jcrwid, Long jcdwid, List<ZqczRyxxVo> ldbzRyxxList, List<ZqczRyxxVo> ssyzxRyxxList, List<ZqczRyxxVo> desigRyxxList, List<ZqczXmglVo> tdyjXmglList) {
List<ZqczXmRyLsjl> dataList = new ArrayList<>(); List<ZqczXmRyLsjl> dataList = new ArrayList<>();
// 抽检项目 // 抽检项目
...@@ -488,19 +524,8 @@ public class ZqczXmRyLsjlServiceImpl implements ZqczXmRyLsjlService { ...@@ -488,19 +524,8 @@ public class ZqczXmRyLsjlServiceImpl implements ZqczXmRyLsjlService {
String dwmc = dwmcList.stream().distinct().collect(Collectors.joining(",")); String dwmc = dwmcList.stream().distinct().collect(Collectors.joining(","));
String rymc = rymcList.stream().distinct().collect(Collectors.joining(",")); String rymc = rymcList.stream().distinct().collect(Collectors.joining(","));
ZqczXmRyLsjl spotCheckXmRyLsjl = ZqczXmRyLsjl.builder()
.jcrwid(jcrwid) ZqczXmRyLsjl spotCheckXmRyLsjl = new ZqczXmRyLsjl(zsrwid, jcrwid, jcdwid, spotCheckTdyjXmgl, rymc, dwmc);
.jcdwid(jcdwid)
.xmmc(spotCheckTdyjXmgl.getXmmc())
.xmzy(spotCheckTdyjXmgl.getXmzy())
.xmlb(spotCheckTdyjXmgl.getXmlb())
.gzcj(spotCheckTdyjXmgl.getGzcj())
.rymc(rymc)
.dwmc(dwmc)
.create_by(SecurityUtils.getLoginUser().getUsername())
.update_by(SecurityUtils.getLoginUser().getUsername())
.create_time(new Date())
.build();
dataList.add(spotCheckXmRyLsjl); dataList.add(spotCheckXmRyLsjl);
} }
return dataList; return dataList;
......
qianhe-ydsj/src/main/resources/mapper/zqcz/xmrylsjl/ZqczXmRyLsjlMapper.xml
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
<!-- 返回实体 --> <!-- 返回实体 -->
<resultMap id="ZqczXmRyLsjlResult" type="com.qianhe.zqcz.xmrylsjl.domain.ZqczXmRyLsjlVo"> <resultMap id="ZqczXmRyLsjlResult" type="com.qianhe.zqcz.xmrylsjl.domain.ZqczXmRyLsjlVo">
<result property="xmryid" column="XMRYID"/> <result property="xmryid" column="XMRYID"/>
<result property="zsrwid" column="ZSRWID"/>
<result property="jcrwid" column="JCRWID"/> <result property="jcrwid" column="JCRWID"/>
<result property="xmmc" column="XMMC"/> <result property="xmmc" column="XMMC"/>
<result property="xmlb" column="XMLB"/> <result property="xmlb" column="XMLB"/>
...@@ -18,6 +19,7 @@ ...@@ -18,6 +19,7 @@
<sql id="selectCommon"> <sql id="selectCommon">
SELECT SELECT
lsjl.XMRYID, lsjl.XMRYID,
lsjl.ZSRWID,
lsjl.JCRWID, lsjl.JCRWID,
lsjl.XMMC, lsjl.XMMC,
lsjl.XMLB, lsjl.XMLB,
...@@ -34,6 +36,7 @@ ...@@ -34,6 +36,7 @@
<select id="list" parameterType="com.qianhe.zqcz.xmrylsjl.domain.ZqczXmRyLsjlQuery" resultMap="ZqczXmRyLsjlResult"> <select id="list" parameterType="com.qianhe.zqcz.xmrylsjl.domain.ZqczXmRyLsjlQuery" resultMap="ZqczXmRyLsjlResult">
<include refid="selectCommon"></include> <include refid="selectCommon"></include>
<where> <where>
<if test="zsrwid != null ">AND lsjl.ZSRWID = #{zsrwid}</if>
<if test="jcrwid != null ">AND lsjl.JCRWID = #{jcrwid}</if> <if test="jcrwid != null ">AND lsjl.JCRWID = #{jcrwid}</if>
</where> </where>
ORDER BY lsjl.xmlb ORDER BY lsjl.xmlb
...@@ -47,6 +50,7 @@ ...@@ -47,6 +50,7 @@
INSERT INTO zqcz_xm_ry_lsjl INSERT INTO zqcz_xm_ry_lsjl
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="xmryid != null ">XMRYID,</if> <if test="xmryid != null ">XMRYID,</if>
<if test="zsrwid != null ">ZSRWID,</if>
<if test="jcrwid != null ">JCRWID,</if> <if test="jcrwid != null ">JCRWID,</if>
<if test="jcdwid != null">JCDWID,</if> <if test="jcdwid != null">JCDWID,</if>
<if test="xmmc != null and xmmc != ''">XMMC,</if> <if test="xmmc != null and xmmc != ''">XMMC,</if>
...@@ -68,6 +72,7 @@ ...@@ -68,6 +72,7 @@
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="xmryid != null">#{xmryid},</if> <if test="xmryid != null">#{xmryid},</if>
<if test="zsrwid != null ">#{zsrwid},</if>
<if test="jcrwid != null">#{jcrwid},</if> <if test="jcrwid != null">#{jcrwid},</if>
<if test="jcdwid != null">#{jcdwid},</if> <if test="jcdwid != null">#{jcdwid},</if>
<if test="xmmc != null and xmmc != ''">#{xmmc},</if> <if test="xmmc != null and xmmc != ''">#{xmmc},</if>
...@@ -92,6 +97,7 @@ ...@@ -92,6 +97,7 @@
<update id="edit" parameterType="ZqczXmRyLsjl"> <update id="edit" parameterType="ZqczXmRyLsjl">
UPDATE zqcz_xm_ry_lsjl UPDATE zqcz_xm_ry_lsjl
<trim prefix="SET" suffixOverrides=","> <trim prefix="SET" suffixOverrides=",">
<if test="zsrwid != null">ZSRWID = #{zsrwid},</if>
<if test="jcrwid != null">JCRWID = #{jcrwid},</if> <if test="jcrwid != null">JCRWID = #{jcrwid},</if>
<if test="jcdwid != null">JCDWID = #{jcdwid},</if> <if test="jcdwid != null">JCDWID = #{jcdwid},</if>
<if test="xmmc != null and xmmc != ''">XMMC = #{xmmc},</if> <if test="xmmc != null and xmmc != ''">XMMC = #{xmmc},</if>
...@@ -126,6 +132,7 @@ ...@@ -126,6 +132,7 @@
<when test="dataList != null and dataList.size() > 0 and !dataList.isEmpty()"> <when test="dataList != null and dataList.size() > 0 and !dataList.isEmpty()">
INSERT INTO zqcz_xm_ry_lsjl INSERT INTO zqcz_xm_ry_lsjl
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="dataList[0].zsrwid != null">ZSRWID,</if>
<if test="dataList[0].jcrwid != null">JCRWID,</if> <if test="dataList[0].jcrwid != null">JCRWID,</if>
<if test="dataList[0].jcdwid != null">JCDWID,</if> <if test="dataList[0].jcdwid != null">JCDWID,</if>
<if test="dataList[0].xmmc != null and dataList[0].xmmc != ''">XMMC,</if> <if test="dataList[0].xmmc != null and dataList[0].xmmc != ''">XMMC,</if>
...@@ -148,6 +155,7 @@ ...@@ -148,6 +155,7 @@
VALUES VALUES
<foreach collection="dataList" item="item" index="index" separator=","> <foreach collection="dataList" item="item" index="index" separator=",">
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="item.zsrwid != null">#{item.zsrwid},</if>
<if test="item.jcrwid != null">#{item.jcrwid},</if> <if test="item.jcrwid != null">#{item.jcrwid},</if>
<if test="item.jcdwid != null">#{item.jcdwid},</if> <if test="item.jcdwid != null">#{item.jcdwid},</if>
<if test="item.xmmc != null and item.xmmc != ''">#{item.xmmc},</if> <if test="item.xmmc != null and item.xmmc != ''">#{item.xmmc},</if>
...@@ -178,4 +186,8 @@ ...@@ -178,4 +186,8 @@
<delete id="deleteByJcrwid" parameterType="long"> <delete id="deleteByJcrwid" parameterType="long">
DELETE FROM zqcz_xm_ry_lsjl WHERE JCRWID = #{jcrwid} DELETE FROM zqcz_xm_ry_lsjl WHERE JCRWID = #{jcrwid}
</delete> </delete>
<!-- 根据直属任务任务ID删除 -->
<delete id="deleteByZsrwid" parameterType="long">
DELETE FROM zqcz_xm_ry_lsjl WHERE ZSRWID = #{zsrwid}
</delete>
</mapper> </mapper>
\ No newline at end of file
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