Merge remote-tracking branch 'origin/develop_master' into develop_3

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

@@ -17,6 +17,9 @@ import java.util.Set;
 //@FeignClient(value = "shan6")
 public interface workFlowFeignClient {
 
+    @RequestMapping(value = "/bat-wkflow/task/get_verify_by_instance",method = RequestMethod.GET)
+    long get_verify_by_instance(@RequestParam("taskId") String taskId, @RequestParam("pId") String pId);
+
     @RequestMapping(value = "/bat-wkflow/activiti_define_start_user",method = RequestMethod.GET)
     Wrapper<String> activiti_define_start(@RequestParam("id") String id, @RequestParam("userId") String userId, @RequestParam("bpnId") String bpnId);
 

adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java

@@ -25,6 +25,11 @@ public class workFlowFeignClientImpl {
     @Autowired
     private IUserEOService userEOService;
 
+    public long get_verify_by_instance(@RequestParam("taskId") String taskId, @RequestParam("pId") String pId){
+        long stringWrapper = workFlowFeignClient.get_verify_by_instance(taskId,pId);
+        return stringWrapper;
+    }
+
     public ResponseMessage activiti_define_start(@RequestParam("Id") String Id, @RequestParam("userId") String userId, @RequestParam("bpnId") String bpnId){
         Wrapper<String> stringWrapper = workFlowFeignClient.activiti_define_start(Id,userId,bpnId);
         return Result.success(stringWrapper.getResult());

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

@@ -51,6 +51,12 @@ public class WorkFlowController {
 //    @Autowired
 //    private ExportExcelMapper exportExcelMapper;
 
+    @ApiOperation(value = "流程实例明细验证是否完成")
+    @GetMapping("/get_verify_by_instance")
+    public long activiti_define_start1(@RequestParam("taskId") String taskId, @RequestParam("pId") String pId){
+        return  workFlowFeignClient.get_verify_by_instance(taskId,pId);
+    }
+
     @ApiOperation(value = "导出excel")
     @PostMapping("/export_excel")
     public void exportExcel(@RequestBody ExportExcelEO exportExcelEO, HttpServletResponse response, HttpServletRequest request) throws IOException {

adc-da-convert/pom.xml

@@ -27,7 +27,9 @@
         <dependency>
             <groupId>com.artofsolving</groupId>
             <artifactId>jodconverter</artifactId>
-            <version>2.2.1</version>
+            <scope>system</scope>
+            <version>2.2.2</version>
+            <systemPath>${basedir}/src/main/lib/jodconverter-2.2.2.jar</systemPath>
         </dependency>
         <dependency>
             <groupId>org.jodconverter</groupId>

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java

@@ -55,8 +55,7 @@ public class SarPublicIdeaServiceImpl extends ServiceImpl<SarPublicIdeaDao, SarP
         } else {
             list.like(StringUtils.isNotEmpty(category), "category", category)
                     .like(StringUtils.isNotEmpty(cname), "cname", cname)
-                    .ge(start != null, "start_time", start)
+                    .ge("end_time", new Date())
-                    .le(end != null, "end_time", end)
                     .orderByAsc("end_time");
         }
         Page<SarPublicIdea> page = new Page<>(p, size);

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java

@@ -19,8 +19,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
+import java.util.*;
-import java.util.List;
 
 /**
  * <p>
@@ -193,7 +192,35 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
     }
 
     public List<SarStandItemsDto> findAllItems(String type,String[] ids){
-        return dao.selectAllItemsByIds(type,ids);
+        List<SarStandItemsDto> list=dao.selectAllItemsByIds(type,ids);
+        List<SarStandItemsDto> res=new ArrayList<>();
+        if (null == list || list.isEmpty()){
+            return list;
+        }else {
+            List<Integer> integerList=new ArrayList<>();
+            Map<Integer,List<SarStandItemsDto>> map=new HashMap<>();
+            list.forEach(sarStandItemsDto -> {
+                int a= sarStandItemsDto.getItemsNum().indexOf(".");
+                String mark=sarStandItemsDto.getItemsNum();
+                if (a>0){
+                    mark=mark.substring(0,a);
+                }
+               if (null != map.get(Integer.valueOf(mark))){
+                   map.get(Integer.valueOf(mark)).add(sarStandItemsDto);
+               }else {
+                   integerList.add(Integer.valueOf(mark));
+                   List<SarStandItemsDto> middle=new ArrayList<>();
+                   middle.add(sarStandItemsDto);
+                   map.put(Integer.valueOf(mark),middle);
+               }
+            });
+            Collections.sort(integerList);
+            integerList.forEach(integer -> {
+                res.addAll(map.get(integer));
+            });
+
+            return res;
+        }
     }
 
 

adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml

@@ -742,6 +742,7 @@
                 #{item}
             </foreach>
         </if>
+        order by ITEMS_NUM
     </select>
     <select id="selectStandTime" resultType="com.adc.da.slrs.sarStandItems.entity.StandsTimeDto">
         select STAND_ID,XCXSSRQ,ZCCSSRQ