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

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

@@ -24,6 +24,7 @@ public class ActDefineStartMap {
 
         map.put("8","nonConformanceRectificationKey");
         map.put("9","standardReadWkflow");
+        map.put("10","itemlistvalidationprocessKey");
         return map.get(type);
     }
 }

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

@@ -292,8 +292,8 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
 
     @Override
     public IPage<SarLawsDetailedList> AllSelectD(Integer page, Integer pageSize, String sortKey,
-                                                 String countryArea, String projectName, String carType,
+                                                 String countryArea, String projectName,
-                                                 String detailedList, String detailedListName) {
+                                                 String detailedList, String detailedListName,String carType) {
         QueryWrapper<SarLawsDetailedList> wrapper = new QueryWrapper<>();
         if ("1".equals(sortKey)) {
             wrapper.like(StringUtils.isNotEmpty(countryArea), "country_area", countryArea).

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java

@@ -50,6 +50,15 @@ public class SarStandProjectLibraryController extends BaseController<SarStandPro
         return Result.success("200",map);
     }
 
+    @GetMapping("/queryProjectConfirm")
+    @ApiOperation("车型/项目库-清单标准确认流程用")
+    public ResponseMessage queryMaintenanceProjectConfirm(@RequestParam(defaultValue = "1", value = "Page")int Page, @RequestParam(defaultValue = "10", value = "PageSize") int PageSize,SarStandProjectLibraryDto sarDto) {
+        IPage<SarStandProjectLibrary> MaintenanceList = sarStandProjectLibraryService.queryMaintenanceProjectConfirm(Page,PageSize,sarDto);
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("total",MaintenanceList);
+        return Result.success("200",map);
+    }
+
     @GetMapping("/queryProjectWorkFlow")
     @ApiOperation("车型/项目库-！！！")
     public ResponseMessage queryMaintenanceProjectWorkFlow(@RequestParam(defaultValue = "1", value = "Page")int Page, @RequestParam(defaultValue = "10", value = "PageSize") int PageSize,SarStandProjectLibraryDto sarDto) {

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java

@@ -26,4 +26,5 @@ public interface SarStandProjectLibraryDao extends BaseMapper<SarStandProjectLib
         Integer selectCountWorkFlow(@Param("qu") SarStandProjectLibrary sar,@Param("flag")int flag);
         List<String> getAllStands();
         List<String> getAllStand();
+        void deleteByProjectId(@Param("projectId")String projectId);
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java

@@ -9,6 +9,7 @@ import java.util.List;
 public interface SarStandProjectLibraryService {
     IPage<SarStandProjectLibrary> queryMaintenanceProject(int current, int pageSize, SarStandProjectLibraryDto sarDto);
     IPage<SarStandProjectLibrary> queryMaintenanceProjectWorkFlow(int current, int pageSize, SarStandProjectLibraryDto sarDto);
+    IPage<SarStandProjectLibrary> queryMaintenanceProjectConfirm(int current, int pageSize, SarStandProjectLibraryDto sarDto);
     IPage<SarStandProjectLibrary> queryNotMaintenanceProject(int current, int pageSize, SarStandProjectLibraryDto sarDto);
     List<SarStandProjectLibrary> queryById(String id);
     IPage<SarStandProjectLibrary> queryProjectManager(int current, int pageSize);

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java

@@ -98,6 +98,36 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
         int flag=3;
         return getSarStandProjectLibraryIPage(current, pageSize, sar,flag);
     }
+
+    @Override
+    public IPage<SarStandProjectLibrary> queryMaintenanceProjectConfirm(int current, int pageSize,
+                                                                 SarStandProjectLibraryDto sarDto) {
+        SarStandProjectLibrary sar = new SarStandProjectLibrary();
+        sar.setProjectPlatfor(sarDto.getProjectPlatfor());
+        sar.setProjectNumber(sarDto.getProjectNumber());
+        sar.setProjectName(sarDto.getProjectName());
+        sar.setProjectClassification(sarDto.getProjectClassification());
+        sar.setProjectStatus(sarDto.getProjectStatus());
+        sar.setProjectGroup(sarDto.getProjectGroup());
+        sar.setCurrentNode(sarDto.getCurrentNode());
+        sar.setProjectLevel(sarDto.getProjectLevel());
+        sar.setProjectManager(sarDto.getProjectManager());
+        sar.setProductLine(sarDto.getProductLine());
+        SimpleDateFormat formater = new SimpleDateFormat();
+        formater.applyPattern("yyyy-MM-dd");
+        try {
+            if (sarDto.getProjectStartDate()!=null){
+                sar.setProjectStartDate(formater.parse(sarDto.getProjectStartDate()));
+            }
+            if (sarDto.getProjectEndDate()!=null){
+                sar.setProjectEndDate(formater.parse(sarDto.getProjectEndDate()));
+            }
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        int flag=4;
+        return getSarStandProjectLibraryIPage(current, pageSize, sar,flag);
+    }
     @Override
     public IPage<SarStandProjectLibrary> queryNotMaintenanceProject(int current, int pageSize,
                                                                     SarStandProjectLibraryDto sarDto) {
@@ -240,6 +270,7 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
 
     @Override
     public void batchInsert(List<StandProjectRelationDto> list) {
+        sarStandProjectLibraryDao.deleteByProjectId(list.get(0).getProjectId());
         sarStandProjectLibraryDao.batchInsert(list);
     }
 
@@ -323,7 +354,8 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
             userIPage.setRecords(sarStandProjectLibraries);
             userIPage.setTotal(count);
             return userIPage;
-        }else {
+        }
+        else {
             flag=2;
             List<SarStandProjectLibrary> sarStandProjectLibraries = sarStandProjectLibraryDao.selectPagesWorkFlow(current, pageSize, wrapper, flag);
             Integer count = sarStandProjectLibraryDao.selectCountWorkFlow(wrapper, flag);

adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml

@@ -64,7 +64,7 @@
 
 
     <select id="selectLawsId" resultType="string">
-        select stand_id from sar_laws_attr_detailed_list
+        select  stand_id from sar_laws_attr_detailed_list
         LEFT JOIN sar_standards_info si ON sar_laws_attr_detailed_list.stand_id = si.ID
         <where>
             <if test="standId != null">
@@ -78,6 +78,7 @@
             </if>
             <if test="sar.standNumber != null">
                 and concat(concat(concat(concat(si.STAND_SORT,' '),si.STAND_NUMBER),'-'),si.STAND_YEAR) like concat(concat('%', #{sar.standNumber}),'%')
+                or si.STAND_NAME like concat(concat('%', #{sar.standNumber}),'%')
             </if>
             <if test="sar.standName != null">
                 and si.STAND_NAME like concat(concat('%', #{sar.standName}),'%')

adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml

@@ -27,6 +27,11 @@
 
     </delete>
 
+    <delete id="deleteByProjectId">
+        delete from sar_stand_project_relation where
+             project_id= #{projectId}
+    </delete>
+
     <select id="selectCount" resultType="java.lang.Integer">
         SELECT
         count(sar_stand_project_library.id ) as total
@@ -34,13 +39,16 @@
         sar_stand_project_library
         LEFT JOIN ts_user tu ON project_manager = tu.USID
         WHERE
-        (
+
         <if test="flag == 1">
             id NOT IN ( SELECT project_id FROM sar_stand_project_relation )
         </if>
         <if test="flag == 2">
             id IN ( SELECT project_id FROM sar_stand_project_relation )
         </if>
+        <if test="flag == 4">
+            1=1
+        </if>
         <if test="qu != null">
             <if test="qu.projectNumber != null">
                 AND project_number LIKE concat(concat('%',#{qu.projectNumber}),'%')
@@ -79,7 +87,7 @@
                 AND project_end_date &lt;= #{qu.projectEndDate}
             </if>
         </if>
-        )
+
     </select>
 
     <select id="selectPages" resultType="com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary">
@@ -90,13 +98,15 @@
         sar_stand_project_library
         LEFT JOIN ts_user tu ON project_manager = tu.USID
         WHERE
-        (
         <if test="flag == 1">
             id NOT IN ( SELECT project_id FROM sar_stand_project_relation )
         </if>
         <if test="flag == 2">
             id IN ( SELECT project_id FROM sar_stand_project_relation )
         </if>
+        <if test="flag == 4">
+            1=1
+        </if>
         <if test="qu != null">
             <if test="qu.projectNumber != null">
                 AND project_number LIKE concat(concat('%',#{qu.projectNumber}),'%')
@@ -135,7 +145,7 @@
                 AND project_end_date &lt;= #{qu.projectEndDate}
             </if>
         </if>
-        )
+
         limit ${(page-1)*size},${page*size}
     </select>
     <select id="selectPagesWorkFlow"