工作交接修改提交以及自查单位

dev-selfcheck/src/main/java/com/tykj/dev/device/selfcheck/controller/SelfCheckController.java

@@ -999,7 +999,7 @@ public class SelfCheckController {
         Integer storageLocationId = selfCheckVo.getStorageLocationId();
         String unit = userUtils.getCurrentUserUnitName();
         PredicateBuilder<DeviceLibrary> predicateBuilder = Specifications.and();
-//        predicateBuilder.eq("locationUnit", unit);
+        predicateBuilder.eq("ownUnit", unit);
         if (selfCheckVo.getFilterStatusList() != null){
             predicateBuilder.notIn("lifeStatus",selfCheckVo.getFilterStatusList().toArray());
 
@@ -1010,7 +1010,7 @@ public class SelfCheckController {
             if (storageLocationId1 != null ){
                 if (storageLocationId1 != 0){
                     predicateBuilder.eq("storageLocationId",storageLocationId1);
-                    predicateBuilder.eq("ownUnit", unit);
+//                    predicateBuilder.eq("ownUnit", unit);
                 }
             }
         }else {

dev-task/src/main/java/com/tykj/dev/device/task/service/impl/TaskServiceImpl.java

@@ -1508,8 +1508,10 @@ public class TaskServiceImpl implements TaskService {
             predicateBuilder.eq("billStatus", StatusEnum.ARCHIVE.id);
         }
         if (taskSelectVo.getSelectNum() == 0) {
+            if (!taskSelectVo.getBusinessType().contains(BusinessEnum.WORK_HANDOVER.id)) {
                 predicateBuilder.notIn("billStatus", StatusEnum.ARCHIVE.id);
             }
+        }
         if (taskSelectVo.getSelectNum() == 1) {
             predicateBuilder.eq("createUserId", userUtils.getCurrentUserId());
             predicateBuilder.notIn("billStatus", StatusEnum.ARCHIVE.id);

dev-train/src/main/java/com/tykj/dev/device/train/controller/HandoverController.java

 package com.tykj.dev.device.train.controller;
 
 import com.tykj.dev.config.swagger.AutoDocument;
+import com.tykj.dev.device.train.entity.vo.TerminateVo;
 import com.tykj.dev.device.train.entity.vo.WorkHandoverAddVo;
 import com.tykj.dev.device.train.entity.vo.WorkHandoverEndAddVo;
 import com.tykj.dev.device.train.service.WorkHandoverService;
@@ -86,10 +87,10 @@ public class HandoverController {
     /**
      * 工作交接-终止工作交接
      */
-    @GetMapping(value = "/terminateWorkHandover/{billId}")
+    @PostMapping(value = "/terminateWorkHandover")
     @ApiOperation(value = "工作交接-终止工作交接")
-    public ResponseEntity userList(@ApiIgnore @AuthenticationPrincipal SecurityUser securityUser, @PathVariable Integer billId) {
-        workHandoverService.terminateWorkHandover(billId);
+    public ResponseEntity userList(@ApiIgnore @AuthenticationPrincipal SecurityUser securityUser, @RequestBody TerminateVo terminateVo) {
+        workHandoverService.terminateWorkHandover(terminateVo);
         return ResponseEntity.ok("终止成功");
     }
 

dev-train/src/main/java/com/tykj/dev/device/train/entity/WorkHandover.java

@@ -69,6 +69,13 @@ public class WorkHandover {
     @ApiModelProperty(value = "区块链RID",name = "recordId")
     private String recordId;
 
+
+    /**
+     * 终止说明
+     */
+    @Column(name = "terminate" ,columnDefinition = "TEXT")
+    private String terminate;
+
     /**
      * 工作交接单据集合
      */

dev-train/src/main/java/com/tykj/dev/device/train/entity/vo/TerminateVo.java

+package com.tykj.dev.device.train.entity.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Column;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "终止说明vo", description = "终止说明vo")
+public class TerminateVo {
+
+    /**
+     * 终止说明
+     */
+    @ApiModelProperty(value = "终止说明", example = "bmxx", name = "terminate")
+    @Column(name = "terminate" ,columnDefinition = "TEXT")
+    private String terminate;
+
+
+    /**
+     * 工作交接id
+     */
+    @ApiModelProperty(value = "工作交接id", example = "bmxx", name = "billId")
+    private Integer billId;
+
+}

dev-train/src/main/java/com/tykj/dev/device/train/service/WorkHandoverService.java

 package com.tykj.dev.device.train.service;
 
 import com.tykj.dev.device.train.entity.WorkHandover;
+import com.tykj.dev.device.train.entity.vo.TerminateVo;
 import com.tykj.dev.device.train.entity.vo.WorkHandoverAddVo;
 import com.tykj.dev.device.train.entity.vo.WorkHandoverEndAddVo;
 import com.tykj.dev.device.user.subject.entity.SecurityUser;
@@ -45,5 +46,5 @@ public interface WorkHandoverService {
     /**
      * 终止工作交接
      */
-    void terminateWorkHandover(Integer billId);
+    void terminateWorkHandover(TerminateVo terminateVo);
 }

dev-train/src/main/java/com/tykj/dev/device/train/service/impl/WorkHandoverServiceImpl.java

@@ -8,6 +8,7 @@ import com.tykj.dev.device.train.dao.WorkHandoverDao;
 import com.tykj.dev.device.train.dao.WorkHandoverDevDao;
 import com.tykj.dev.device.train.entity.WorkHandover;
 import com.tykj.dev.device.train.entity.WorkHandoverDev;
+import com.tykj.dev.device.train.entity.vo.TerminateVo;
 import com.tykj.dev.device.train.entity.vo.WorkHandoverAddVo;
 import com.tykj.dev.device.train.entity.vo.WorkHandoverEndAddVo;
 import com.tykj.dev.device.train.entity.vo.WorkHandoverUserVo;
@@ -188,11 +189,12 @@ public class WorkHandoverServiceImpl implements WorkHandoverService {
     }
 
     @Override
-    public void terminateWorkHandover(Integer billId) {
-        Optional<WorkHandover> byId = workHandoverDao.findById(billId);
+    public void terminateWorkHandover(TerminateVo terminateVo) {
+        Optional<WorkHandover> byId = workHandoverDao.findById(terminateVo.getBillId());
         if (byId.isPresent()){
             WorkHandover workHandover = byId.get();
             workHandover.setStatus(3);
+            workHandover.setTerminate(terminateVo.getTerminate());
             workHandoverDao.save(workHandover);
             TaskBto taskBto = trainTaskService.selectFatherIsNullAndBillidAndBillType(workHandover.getWorkHandoverId(), BusinessEnum.WORK_HANDOVER.id);
             taskService.moveToArchive(taskBto);

dev-union/src/main/resources/application-dev.properties

-server.port=8088
+server.port=8090
 
 spring.application.name=device-dev
 spring.datasource.url=jdbc:mysql://192.168.0.232:3307/device_master?serverTimezone=Asia/Shanghai&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false

dev-union/src/main/resources/application-test.properties

 spring.datasource.driver-class-name=com.oscar.Driver
 #spring.datasource.url=jdbc:oscar://10.153.4.10:2003/OSRDB
-spring.datasource.url=jdbc:oscar://192.168.0.80:2003/OSRDB
+spring.datasource.url=jdbc:oscar://10.153.4.80:2003/OSRDB
 spring.datasource.username=SYSDBA
 spring.datasource.password=szoscar55
 spring.jpa.database-platform=org.hibernate.dialect.OscarDialect
 file.path=/opt/zb/
 #preview.path=http://10.153.4.11:8088/equip/file/
-preview.path=http://192.168.0.80:8088/equip/file/
+preview.path=http://10.153.4.80:8088/equip/file/
 
 spring.boot.admin.client.url=http://localhost:8769
 spring.boot.admin.client.instance.serviceBaseUrl=http://localhost:8087
 block.flag=true
-readMachine.ip=192.168.101.202
+readMachine.ip=10.153.4.80
 
 qrcode.path = /opt/qrcode/
-qrcode.preview.path=http://192.168.0.80/equip/code/
+qrcode.preview.path=http://10.153.4.80/equip/code/
 
-carrier.url = http://192.168.0.80:8088/carrier/configuration/saveConfiguration
+carrier.url = http://10.153.4.80:8088/carrier/configuration/saveConfiguration
 
 file.matching.excel=/data/equip/excel/
\ No newline at end of file