修改合同作废bug

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/HouseholdContractController.java

@@ -20,6 +20,7 @@ import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.eclipse.paho.client.mqttv3.MqttException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -283,17 +284,21 @@ public class HouseholdContractController extends BaseController {
         wrapper.eq(ToDoTasks::getType, TaskTypeStationEnum.合同填报.getCode());
         wrapper.eq(ToDoTasks::getState, "待办");
         wrapper.eq(ToDoTasks::getBusinessId, householdContrac.getSequenceNbr());
-        ToDoTasks doTasks= toDoTasksMapper.selectOne(wrapper);
+        List<ToDoTasks> doTasks= toDoTasksMapper.selectList(wrapper);
         if(doTasks!=null){
-            doTasks.setState("作废");
-            doTasks.setIsDelete(true);
-            toDoTasksMapper.updateById(doTasks);
-            emqKeeper.getMqttClient().publish("TASK_MESSAGE" ,JSON.toJSONString(doTasks).getBytes(), 2 ,false);
-
-            UserMessage userMessage=  new UserMessage( doTasks.getType(),  doTasks.getBusinessId(),  doTasks.getAmosUserId(),  new Date(),  doTasks.getTaskName()+"已作废",  doTasks.getAmosOrgCode());
-            userMessageMapper.insert(userMessage);
-            emqKeeper.getMqttClient().publish("MY_MESSAGE" , JSON.toJSONString(userMessage).getBytes(), 2 ,false);
-
+            doTasks.forEach(e->{
+                try {
+                    e.setState("作废");
+                    e.setIsDelete(true);
+                    toDoTasksMapper.updateById(e);
+                    emqKeeper.getMqttClient().publish("TASK_MESSAGE" ,JSON.toJSONString(e).getBytes(), 2 ,false);
+                    UserMessage userMessage=  new UserMessage( e.getType(),  e.getBusinessId(),  e.getAmosUserId(),  new Date(),  e.getTaskName()+"已作废",  e.getAmosOrgCode());
+                    userMessageMapper.insert(userMessage);
+                    emqKeeper.getMqttClient().publish("MY_MESSAGE" , JSON.toJSONString(userMessage).getBytes(), 2 ,false);
+                } catch (MqttException mqttException) {
+                    mqttException.printStackTrace();
+                }
+            });
         }
     }catch (Exception e){
         e.printStackTrace();

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/AcceptanceCheckServiceImpl.java

@@ -223,7 +223,7 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
 
         ConstructionAcceptanceRecords da = new ConstructionAcceptanceRecords();
         da.setOperationTime(new Date());
-        da.setOperationContent("并网管理-经销商管理员审核-"+(approvalStatus.equals("0")?"通过":"驳回"));
+        da.setOperationContent("验收管理-经销商管理员审核-"+(approvalStatus.equals("0")?"通过":"驳回"));
         da.setOperator(kv.get("operator"));
         da.setOperationResults(approvalStatus.equals("0")?"通过":"驳回");
         da.setAcceptanceId(basicGridRecord.getSequenceNbr());

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/WorkOrderServiceImpl.java

@@ -955,7 +955,7 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 		}
 		if (Objects.nonNull(acceptanceCheck)){
 			LambdaQueryWrapper<ConstructionAcceptanceRecords> up7 = new LambdaQueryWrapper<ConstructionAcceptanceRecords>();
-			up7.eq(ConstructionAcceptanceRecords::getAcceptanceId, workOrderId);
+			up7.eq(ConstructionAcceptanceRecords::getAcceptanceId, acceptanceCheck.getSequenceNbr());
 			up7.eq(ConstructionAcceptanceRecords::getWorkOrderPowerStationId, workOrderPowerStationId);
 			up7.orderByAsc(ConstructionAcceptanceRecords::getRecDate);
 			List<ConstructionAcceptanceRecords> li1 = constructionAcceptanceRecordsMapper.selectList(up7);