Forráskód Böngészése

feat: 接单审批

李学松 2 éve
szülő
commit
9e9914850c

+ 45 - 26
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmScorePackageStatusServiceImpl.java

@@ -32,6 +32,7 @@ import com.qunzhixinxi.hnqz.admin.entity.WmScorePackageStatus;
 import com.qunzhixinxi.hnqz.admin.entity.WmTask;
 import com.qunzhixinxi.hnqz.admin.entity.input.WmScorePackageApiInput;
 import com.qunzhixinxi.hnqz.admin.entity.input.WmScorePackageApiOutput;
+import com.qunzhixinxi.hnqz.admin.enums.PackageTypeEnum;
 import com.qunzhixinxi.hnqz.admin.enums.ScorePackageStatusEnum;
 import com.qunzhixinxi.hnqz.admin.mapper.WmScorePackageMapper;
 import com.qunzhixinxi.hnqz.admin.mapper.WmScorePackageStatusMapper;
@@ -80,11 +81,15 @@ public class WmScorePackageStatusServiceImpl extends ServiceImpl<WmScorePackageS
 		wmScorePackageStatus.setPackageId(packageStatus1.getPackageId());
 		//审批
 		WmScorePackage wmScorePackage=wmScorePackageMapper.selectById(wmScorePackageStatus.getPackageId());
-		if(wmScorePackage.getPackageType1().equals("1")){//定额
+		if(wmScorePackage.getPackageType1().equals(PackageTypeEnum.TYPE1_SCOTE_PACKAGE.val())) {
 			//定额包一人一包,所以score=userscore
 			wmScorePackageStatus.setUserScore(String.valueOf(wmScorePackage.getScore()));
 			wmScorePackageStatus.setTaskNum(0);
-		}else {
+		} else if(wmScorePackage.getPackageType1().equals(PackageTypeEnum.TYPE1_SCORE_AND_TASK_PACKAGE.val())) {
+			//定额+定量(多人承接-按积分值)
+			wmScorePackageStatus.setUserScore(String.valueOf(wmScorePackage.getScore()));
+			wmScorePackageStatus.setTaskNum(wmScorePackage.getTaskNum());
+		}  else {
 			wmScorePackageStatus.setTaskNum(wmScorePackage.getTaskNum());
 			wmScorePackageStatus.setUserScore(String.valueOf(wmScorePackage.getUserScore()));
 		}
@@ -93,24 +98,29 @@ public class WmScorePackageStatusServiceImpl extends ServiceImpl<WmScorePackageS
 		wmScorePackageStatus.setUserId(null);
 		this.updateById(wmScorePackageStatus);
 
-		if("2".equals(wmScorePackageStatus.getStatus())) {//同意
-			wmScorePackage.setScorePackageStatus("3");//进行中
+		// 同意
+		if ("2".equals(wmScorePackageStatus.getStatus())) {
+			// 进行中
+			wmScorePackage.setScorePackageStatus("3");
 			//判断该积分包是否审核满员,如果是,其他接单对象自动改为审核不通过
-			WmScorePackageStatus wmScorePackageStatus1=new WmScorePackageStatus();
+			WmScorePackageStatus wmScorePackageStatus1 = new WmScorePackageStatus();
 			wmScorePackageStatus1.setPackageId(wmScorePackageStatus.getPackageId());
 			wmScorePackageStatus1.setStatus("2");//审核通过
 			wmScorePackageStatus1.setDelFlag("0");
 			wmScorePackageStatus1.setEnableFlag("0");
-			List<WmScorePackageStatus> sList=this.list(Wrappers.query(wmScorePackageStatus1));
-			Integer usernum=wmScorePackage.getUserNum()==null?1:wmScorePackage.getUserNum();
-			if(sList.size()>=usernum){//接单审核通过人数等于积分包需求人数
-				LambdaUpdateWrapper<WmScorePackageStatus> updateWrapper=new LambdaUpdateWrapper();
-				updateWrapper.set(WmScorePackageStatus::getStatus,"3");//审核不通过
-				updateWrapper.set(WmScorePackageStatus::getTaskAddFlag,"0");//不允许新增任务
-				updateWrapper.eq(WmScorePackageStatus::getPackageId,wmScorePackageStatus.getPackageId());
-				updateWrapper.eq(WmScorePackageStatus::getStatus,"1");
-				updateWrapper.eq(WmScorePackageStatus::getDelFlag,"0");
-				updateWrapper.eq(WmScorePackageStatus::getEnableFlag,"0");
+			List<WmScorePackageStatus> sList = this.list(Wrappers.query(wmScorePackageStatus1));
+			int usernum = wmScorePackage.getUserNum() == null ? 1 : wmScorePackage.getUserNum();
+			// 接单审核通过人数等于积分包需求人数
+			if (sList.size() >= usernum) {
+				LambdaUpdateWrapper<WmScorePackageStatus> updateWrapper = new LambdaUpdateWrapper<>();
+				// 审核不通过
+				updateWrapper.set(WmScorePackageStatus::getStatus, "3");
+				// 不允许新增任务
+				updateWrapper.set(WmScorePackageStatus::getTaskAddFlag, "0");
+				updateWrapper.eq(WmScorePackageStatus::getPackageId, wmScorePackageStatus.getPackageId());
+				updateWrapper.eq(WmScorePackageStatus::getStatus, "1");
+				updateWrapper.eq(WmScorePackageStatus::getDelFlag, "0");
+				updateWrapper.eq(WmScorePackageStatus::getEnableFlag, "0");
 				this.update(updateWrapper);
 				//wmScorePackage.setPackageStatus("2");
 				wmScorePackage.setUpdateTime(LocalDateTime.now());
@@ -119,8 +129,10 @@ public class WmScorePackageStatusServiceImpl extends ServiceImpl<WmScorePackageS
 				wmScorePackageMapper.updateById(wmScorePackage);
 			}
 
-		}else {//不同意
-			wmScorePackageStatus.setTaskAddFlag("0");//不可以新增任务
+		} else {
+			// 不同意
+			// 不可以新增任务
+			wmScorePackageStatus.setTaskAddFlag("0");
 			wmScorePackageStatus.setUserId(null);
 			this.updateById(wmScorePackageStatus);
 		}
@@ -131,20 +143,27 @@ public class WmScorePackageStatusServiceImpl extends ServiceImpl<WmScorePackageS
 		query.setDelFlag("0");
 		query.setEnableFlag("0");
 		int total = this.count(Wrappers.query(query));
-		if(total>=1){//有人接单成功
-			wmScorePackage.setScorePackageStatus("3");//进行中
-			if(total>=wmScorePackage.getUserNum()){//人数已满
-				wmScorePackage.setIsReceive("1");//不允许接单
+		// 有人接单成功
+		if (total >= 1) {
+			// 进行中
+			wmScorePackage.setScorePackageStatus("3");
+			// 人数已满
+			if (total >= wmScorePackage.getUserNum()) {
+				// 不允许接单
+				wmScorePackage.setIsReceive("1");
 			}
-		}else {//没有人接单成功
+		} else {
+			// 没有人接单成功
 			WmScorePackageStatus query1 = new WmScorePackageStatus();
 			query1.setPackageId(wmScorePackageStatus.getPackageId());
 			query1.setStatus("1");
 			int total1 = this.count(Wrappers.query(query1));
-			if(total1==0){
-				wmScorePackage.setScorePackageStatus("1");//已分派待申领
-			}else {
-				wmScorePackage.setScorePackageStatus("2");//已申领待审批
+			if (total1 == 0) {
+				// 已分派待申领
+				wmScorePackage.setScorePackageStatus("1");
+			} else {
+				// 已申领待审批
+				wmScorePackage.setScorePackageStatus("2");
 			}
 
 		}