标准清单入库流程

adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java

@@ -13,7 +13,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-@FeignClient(value = "bat-wkflow")
+//@FeignClient(value = "bat-wkflow")
+@FeignClient(value = "shan")
 public interface workFlowFeignClient {
 
     @RequestMapping(value = "/bat-wkflow/activiti_define_start_user",method = RequestMethod.GET)

adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java

@@ -15,7 +15,7 @@ public class ActDefineStartMap {
 
         Map<String,String> map = new TreeMap<>();
         map.put("1","standardLibraryWkflow");
-
+        map.put("3","standardregulatoryinventory");
         return map.get(type);
     }
 }

adc-da-activiti/src/main/java/com/adc/da/common/BusMes.java

@@ -1,13 +1,19 @@
 package com.adc.da.common;
 
+import io.swagger.annotations.ApiModelProperty;
+
 public class BusMes {
 
+    @ApiModelProperty(value = "用户id")
     private String userId;
 
+    @ApiModelProperty(value = "任务id")
     private String taskId;
 
+    @ApiModelProperty(value = "json")
     private String json;
 
+    @ApiModelProperty(value = "任务ids")
     private String taskIds;
 
     private String pId;

adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java

@@ -213,7 +213,7 @@ public class WorkFlowController {
 
     @ApiOperation(value = "完成任务")
     @PostMapping("/completeTask")
-    public  Wrapper<String> completeTaskByUserId(BusMes busMes){
+    public  Wrapper<String> completeTaskByUserId(@RequestBody BusMes busMes){
         Wrapper<String> str = workFlowFeignClient.completeTaskByUserId(busMes);
         if(str.getCode() == 500){
             str.setSuccess(false);

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java

@@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -101,6 +102,13 @@ public class SarLawsDetailedListController extends BaseController<SarLawsDetaile
     }
 
 
+    @ApiOperation(value = "清单根据id单独查询")
+    @PostMapping("/getStandById")
+    public SarLawsDetailedList getStandById(@RequestParam("id") String id) {
+        return sarLawsDetailedListService.selSarLawDetailById(id);
+    }
+
+
     /**
      * @param detailedUpDto 修改的信息，通过类进行接收
      * @return ResponseMessage

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/DetailedUpDto.java

@@ -43,8 +43,8 @@ public class DetailedUpDto {
     @ApiModelProperty(value = "适用领域")
     private String applicationScope;
 
-//    @ApiModelProperty(value = "附件id")
-//    private String fileId;
+    @ApiModelProperty(value = "附件id")
+    private String fileId;
 
 
     @ApiModelProperty(value = "更新时间")

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/SarLawsDetailedList.java

@@ -77,5 +77,9 @@ public class SarLawsDetailedList extends BaseEntity {
     @TableField("update_people")
     private String updatePeople;
 
+    @ApiModelProperty(value = "附件id")
+    @TableField("file_id")
+    private String fileId;
+
 
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/ISarLawsDetailedListService.java

@@ -5,6 +5,7 @@ import com.adc.da.slrs.sarLawsDetailedList.entity.SarLawsDetailedList;
 import com.adc.da.slrs.sarLawsDetailedList.entity.DetailedUpDto;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -26,4 +27,6 @@ public interface ISarLawsDetailedListService extends IService<SarLawsDetailedLis
 //    IPage<SarLawsDetailedList> selectAllP(Integer pages,Integer size,String sortKey);
 
     String updateList(DetailedUpDto detailedUpDto);
+
+    SarLawsDetailedList selSarLawDetailById(@Param("id")String id);
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java

@@ -1,7 +1,6 @@
 package com.adc.da.slrs.sarLawsDetailedList.service.impl;
 
 import com.adc.da.att.service.IAttFileEOService;
-import com.adc.da.slrs.sarLawsAttrDetailedList.dao.SarDetailedIdAttFileDao;
 import com.adc.da.slrs.sarLawsAttrDetailedList.dao.SarLawsAttrDetailedListDao;
 import com.adc.da.slrs.sarLawsAttrDetailedList.entity.SarLawsAttrDetailedList;
 import com.adc.da.slrs.sarLawsAttrDetailedList.service.impl.SarLawsAttrDetailedListServiceImpl;
@@ -16,7 +15,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
-import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -62,7 +60,7 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
                     .id(UUIDUtils.randomUUID20())
                     .sortKey(addDetailedDto.getSortKey())
                     .detailedListName(addDetailedDto.getDetailedListName())
-                    .detailedListState("1")
+                    .detailedListState("0")
                     .detailedListVision("v0")
                     .applicationScope(addDetailedDto.getApplicationScope())
                     .updateTime(new Date())
@@ -143,6 +141,10 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
         if (StringUtils.isBlank(detailedUpDto.getRemark())) list.setRemark(null);
         else if ("null".equals(detailedUpDto.getRemark()));
         list.setRemark(detailedUpDto.getRemark());
+        //版本号
+        if (StringUtils.isBlank(detailedUpDto.getDetailedListVision())) list.setDetailedListVision(null);
+        else if ("null".equals(detailedUpDto.getDetailedListVision()));
+        list.setDetailedListVision(detailedUpDto.getDetailedListVision());
         //更新时间
         list.setUpdateTime(new Date());
         //更新人
@@ -150,8 +152,18 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
         else if ("null".equals(detailedUpDto.getReNewPeople()));
         else list.setUpdatePeople(detailedUpDto.getReNewPeople());
 
+        //更新人
+        if (StringUtils.isBlank(detailedUpDto.getDetailedListState())) list.setDetailedListState(null);
+        else if ("null".equals(detailedUpDto.getDetailedListState()));
+        else list.setDetailedListState(detailedUpDto.getDetailedListState());
+
         sarLawsDetailedListDao.updateById(list);
         service.updateDetailedLaws(detailedUpDto.getId(), detailedUpDto.getLawsIds());
         return "修改成功";
     }
+
+    @Override
+    public SarLawsDetailedList selSarLawDetailById(String id) {
+        return baseMapper.selectById(id);
+    }
 }