fix(一般检索): 字段调整

db/es_index.json

@@ -32,6 +32,15 @@
                         }
                     }
                 },
+                "applicable_market": {
+                    "type": "text",
+                    "fields": {
+                        "keyword": {
+                            "type": "keyword",
+                            "ignore_above": 256
+                        }
+                    }
+                },
                 "enterprise_standard_state": {
                     "type": "text",
                     "fields": {

laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/StandardInterpretFlowService.java

@@ -22,6 +22,18 @@ public interface StandardInterpretFlowService {
      */
     void flowStart(StandardInterpretFlowDTO standardInterpretFlowDTO);
 
+    /**
+     * 流程发起
+     * @param standardInterpretFlowDTO
+     */
+    void childrenFlowStart(StandardInterpretFlowDTO standardInterpretFlowDTO);
+
+    /**
+     * 流程发起
+     * @param standardInterpretFlowDTO
+     */
+    void childrenFlowStart2(StandardInterpretFlowDTO standardInterpretFlowDTO);
+
     /**
      * 流程审批
      * @param standardInterpretFlowDTO

laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java

@@ -16,7 +16,6 @@ import com.jero.modules.activiti.enums.FinishFlagEnum;
 import com.jero.modules.activiti.enums.ProcessStatusEnum;
 import com.jero.modules.activiti.process.common.enums.ProcessType;
 import com.jero.modules.activiti.process.common.utility.FlowUtility;
-import com.jero.modules.activiti.process.demo.common.ProcessDemoCommon;
 import com.jero.modules.activiti.process.standardinterpret.common.StandardInterpretCommon;
 import com.jero.modules.activiti.process.standardinterpret.dto.StandardInterpretDTO;
 import com.jero.modules.activiti.process.standardinterpret.dto.StandardInterpretFlowDTO;
@@ -39,6 +38,7 @@ import org.activiti.engine.TaskService;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -88,6 +88,33 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe
         taskService.complete(task.getId());
     }
 
+    @Override
+    public void childrenFlowStart(StandardInterpretFlowDTO standardInterpretFlowDTO) {
+        // 流程信息
+        ProcessAll processAll = standardInterpretFlowDTO.getProcessAll();
+        // 流程审批信息
+        ProcessApprovalRecord processApprovalRecord = standardInterpretFlowDTO.getProcessApprovalRecord();
+        // map（参数）
+        Map<String, Object> map = standardInterpretFlowDTO.getMap();
+
+        // 根据流程key启动流程,设置流程变量,更新流程总表信息,更新流程审批信息，返回任务信息
+        startProcessInstanceByKey(StandardInterpretCommon.KEY_2, map, processAll, processApprovalRecord);
+    }
+
+    @Override
+    public void childrenFlowStart2(StandardInterpretFlowDTO standardInterpretFlowDTO) {
+        // 流程信息
+        ProcessAll processAll = standardInterpretFlowDTO.getProcessAll();
+        // 流程审批信息
+        ProcessApprovalRecord processApprovalRecord = standardInterpretFlowDTO.getProcessApprovalRecord();
+        // map（参数）
+        Map<String, Object> map = standardInterpretFlowDTO.getMap();
+
+        // 根据流程key启动流程,设置流程变量,更新流程总表信息,更新流程审批信息，返回任务信息
+        startProcessInstanceByKey(StandardInterpretCommon.KEY_3, map, processAll, processApprovalRecord);
+
+    }
+
     @Override
     public void flowApproval(StandardInterpretFlowDTO standardInterpretFlowDTO) {
         // 流程信息
@@ -111,27 +138,47 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe
         String taskId = delegateTask.getId();
         String taskDefinitionKey = delegateTask.getTaskDefinitionKey();
         String processInstanceId = delegateTask.getProcessInstanceId();
-        Map<String, Object> userInfoMap = new HashMap<>();
-        // 获取 当前流程实例id
+
+        ProcessAll processAlls = processAllService.getOne(new LambdaQueryWrapper<ProcessAll>()
+                .eq(ProcessAll::getProcessInstanceId, processInstanceId));
+
         String mainInstanceId =(String) delegateTask.getVariable(ActivitiCommon.MAIN_INSTANCE_ID);
+        String masterInterpret =(String) delegateTask.getVariable(StandardInterpretCommon.MASTER_INTERPRET);
         //保存父子关联信息
         Map<String, Object> variables = new HashMap<>();
         variables.put(ActivitiCommon.MAIN_INSTANCE_ID, mainInstanceId != null ? mainInstanceId : processInstanceId);
         variables.put(ActivitiCommon.PARENT_TASK_ID, taskId);
+        variables.put(StandardInterpretCommon.MASTER_INTERPRET, masterInterpret);
         if (StandardInterpretCommon.AUTO_TASK_1.equals(taskDefinitionKey)
                 || StandardInterpretCommon.AUTO_TASK_3.equals(taskDefinitionKey)) {
             // 获取子解读人
             List<String> interpretingPeopleList =
                     (List<String>) delegateTask.getVariable(StandardInterpretCommon.INTERPRETING_PEOPLE);
+
             for (String interpretingPeople : interpretingPeopleList) {
                 // 循环发起 标准解读流程（主解读重新分发子流程）
-                userInfoMap.put(ProcessDemoCommon.INTERPRETER, interpretingPeople);
+                variables.put(StandardInterpretCommon.INTERPRETING_PEOPLE, interpretingPeople);
+                StandardInterpretFlowDTO standardInterpretFlowDTO = new StandardInterpretFlowDTO();
+                // 流程信息
+                ProcessAll processAll = new ProcessAll();
+                processAll.setProjectId(processAlls.getProjectId());
+                standardInterpretFlowDTO.setProcessAll(processAll);
+                ProcessApprovalRecord processApprovalRecord = new ProcessApprovalRecord();
+                processApprovalRecord.setParentTaskId(taskId);
+                standardInterpretFlowDTO.setProcessApprovalRecord(processApprovalRecord);
+                standardInterpretFlowDTO.setMap(variables);
+                childrenFlowStart(standardInterpretFlowDTO);
                 log.info("循环发起 标准解读流程（主解读人重新分发子流程）");
             }
+            log.info("子流程个数：{}",interpretingPeopleList.size());
         }else if (StandardInterpretCommon.AUTO_TASK_2.equals(taskDefinitionKey)){
-            // 获取 标准主解读人
-            String masterInterpret = (String) delegateTask.getVariable(StandardInterpretCommon.MASTER_INTERPRET);
-            userInfoMap.put(StandardInterpretCommon.MASTER_INTERPRET, masterInterpret);
+            StandardInterpretFlowDTO standardInterpretFlowDTO = new StandardInterpretFlowDTO();
+            // 流程信息
+            ProcessAll processAll = new ProcessAll();
+            processAll.setProjectId(processAlls.getProjectId());
+            standardInterpretFlowDTO.setProcessAll(processAll);
+            standardInterpretFlowDTO.setMap(variables);
+            childrenFlowStart2(standardInterpretFlowDTO);
             log.info("发起 标准解读流程（子解读人流程）");
         }else if (StandardInterpretCommon.MASTER_INTERPRET_SUMMARY.equals(taskDefinitionKey)){
             // 标准主解读汇总 合并条款
@@ -196,6 +243,7 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe
             ProcessStandardInterpretClauseSublist processStandardInterpretClauseSublist =
                     new ProcessStandardInterpretClauseSublist();
             processStandardInterpretClauseSublist.setStandardInterpretId(processStandardInterpret.getId());
+            // 解读人填写信息（分发）
             if (StandardInterpretCommon.INTERPRETING_PEOPLE_FILLOUT.equals(node)){
                 processStandardInterpretClauseSublist.setInterpretPersonId(loginUser.getId());
             }
@@ -325,7 +373,10 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe
 
         // 更新流程审批信息
         LambdaUpdateWrapper<ProcessApprovalRecord> processApprovalRecordUpdate = new LambdaUpdateWrapper<>();
-        processApprovalRecordUpdate.eq(ProcessApprovalRecord::getTaskId, task.getId());
+        processApprovalRecordUpdate.eq(StringUtils.isNotBlank(task.getId()),
+                ProcessApprovalRecord::getTaskId, task.getId());
+        processApprovalRecordUpdate.eq(StringUtils.isNotBlank(processApprovalRecord.getParentTaskId()),
+                ProcessApprovalRecord::getParentTaskId, task.getParentTaskId());
         processApprovalRecordUpdate.set(ProcessApprovalRecord::getUserId, loginUser.getId());
         processApprovalRecordUpdate.set(ProcessApprovalRecord::getProjectId, processAll.getProjectId());
         processApprovalRecordUpdate.set(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.COMPLETE.getValue());

laws-modules/src/main/java/com/jero/modules/laws/home/dto/LawsHomeNormalSearchDTO.java

@@ -35,30 +35,36 @@ public class LawsHomeNormalSearchDTO implements Serializable {
     @ApiModelProperty(value = "标准状态设置 （1不包含废止标准，2包含废止标准） 默认不包含")
     private String standardStateSet;
     /**
-     * 标准类别 （数据字典 只有外来标准法规：standard_type） (全部传空)
+     * 类型 （数据字典 只有外来标准法规：standard_property (全部传空)
      */
-    @ApiModelProperty(value = "标准类别 （数据字典 只有外来标准法规：standard_type） (全部传空)")
-    private String standardClass;
-    /**
-     * 动力类型 （数据字典 只有外来标准法规：POWER_TYPE_DOMESTIC） (全部传空)
-     */
-    @ApiModelProperty(value = "动力类型 （数据字典 只有外来标准法规：POWER_TYPE_DOMESTIC） (全部传空)")
-    private String dynamicType;
-    /**
-     * 适用车辆类型 （数据字典 只有外来标准法规：APPLICATIONS_DOMESTIC） (全部传空)
-     */
-    @ApiModelProperty(value = "适用车辆类型 （数据字典 只有外来标准法规：APPLICATIONS_DOMESTIC） (全部传空)")
-    private String applicableVehicle;
-    /**
-     * 标准类型 （数据字典 只有外来标准法规：standard_property (全部传空)
-     */
-    @ApiModelProperty(value = "标准类型 （数据字典 只有外来标准法规：standard_property (全部传空)")
+    @ApiModelProperty(value = "类型 （数据字典 只有外来标准法规：standard_property (全部传空)type")
     private String standardProperty;
     /**
-     * 状态 （数据字典 只有外来标准法规：standard_state (全部传空)
+     * 标准状态 （数据字典 只有外来标准法规：standard_state (全部传空)
      */
-    @ApiModelProperty(value = "状态 （数据字典 只有外来标准法规：standard_state (全部传空)")
+    @ApiModelProperty(value = "标准状态 （数据字典 只有外来标准法规：standard_state (全部传空)")
     private String standardState;
+    /**
+     * 标准类别 （数据字典 只有外来标准法规：standard_class） (全部传空)
+     */
+    @ApiModelProperty(value = "标准类别 （数据字典 只有外来标准法规：standard_class） (全部传空)")
+    private String standardClass;
+    /**
+     * 适用车型 （数据字典 只有外来标准法规：APPLICATIONS_DOMESTIC） (全部传空)
+     */
+    @ApiModelProperty(value = "适用车辆类型 （数据字典 只有外来标准法规：APPLICATIONS_DOMESTIC） (全部传空)applicable_vehicle_type")
+    private String applicableVehicle;
+    /**
+     * 动力类型 （数据字典 只有外来标准法规：dynamic_type） (全部传空)
+     */
+    @ApiModelProperty(value = "动力类型 （数据字典 只有外来标准法规：dynamic_type） (全部传空)")
+    private String dynamicType;
+    /**
+     * 适用市场 （数据字典 只有外来标准法规：market_state） (全部传空)
+     */
+    @ApiModelProperty(value = "适用市场 （数据字典 只有外来标准法规：market_state） (全部传空)")
+    private String applicableMarket;
+
     /**
      * 标准分类代码 （数据字典 只有企业标准：standard_category_code (全部传空)
      */

laws-modules/src/main/java/com/jero/modules/laws/home/mapper/xml/LawsHomeSearchMapper.xml

@@ -19,7 +19,7 @@
             when standard_state = 7 then 3
             else 4
             end as standard_state_order,
-            standard_class,dynamic_type,applicable_vehicle,standard_property,standard_state,null as standard_code,null as grade_classification,
+            standard_class,dynamic_type,applicable_vehicle,type,standard_state,null as standard_code,null as grade_classification,
             implementation_date
             from laws_domestic_standard where del_flag = 0
             <if test="standardStateSet == 1">
@@ -57,7 +57,7 @@
         ) a
         group by dynamic_type
         union all
-        select 'applicable_vehicle' as field_name,applicable_vehicle,count(*) from
+        select 'applicable_vehicle_type' as field_name,applicable_vehicle,count(*) from
         (SELECT SUBSTRING_INDEX( SUBSTRING_INDEX( T1.applicable_vehicle, ',', T2.help_topic_id + 1 ), ',', - 1 ) AS applicable_vehicle ,standard_number,standard_name
         FROM laws_domestic_standard T1
         JOIN mysql.help_topic T2 ON T2.help_topic_id &lt; ( LENGTH( T1.applicable_vehicle ) - LENGTH( REPLACE ( T1.applicable_vehicle, ',', '' )) + 1)
@@ -65,8 +65,11 @@
         ) a
          group by applicable_vehicle
         union all
-        select 'standard_property' as field_name,standard_property,count(*) from laws_domestic_standard
-        <where>${ew.sqlSegment}</where> group by standard_property
+        select 'type' as field_name,type,count(*) from laws_domestic_standard
+        <where>${ew.sqlSegment}</where> group by type
+        union all
+        select 'applicable_market' as field_name,type,count(*) from laws_domestic_standard
+        <where>${ew.sqlSegment}</where> group by applicable_market
         union all
         select 'standard_state' as field_name,standard_state,count(*) from laws_domestic_standard
         <where>${ew.sqlSegment}</where> group by standard_state

laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java

@@ -127,7 +127,7 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
     public static final String SEARCH_FLAG = "魑";
 
     public static final String RESOURCE_TYPE = "resource_type";
-    public static final String STANDARD_TYPE = "standard_type";
+    public static final String STANDARD_TYPE = "standard_class";
     public static final String CREATE_TIME = "create_time";
     public static final String CATEGORY_CODE = "category_code";
     public static final String STANDARD_CATEGORY_CODE = "standard_category_code";
@@ -135,9 +135,9 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
     public static final String STANDARD_STATE = "standard_state";
 //    public static final String GRADE_CLASSIFICATION = "grade_classification";
     public static final String STANDARD_CLASS = "standard_class";
-    public static final String APPLICABLE_VEHICLE = "applicable_vehicle";
+    public static final String APPLICABLE_VEHICLE = "applicable_vehicle_type";
     public static final String DYNAMIC_TYPE = "dynamic_type";
-    public static final String STANDARD_PROPERTY = "standard_property";
+    public static final String STANDARD_PROPERTY = "type";
     public static final String CONTENT = "content";
     public static final String SYNC_ES_ERR = "同步ES数据异常：";
     public static final String  YYYY_MM_DD = "yyyy-MM-dd";
@@ -227,7 +227,7 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
         QueryWrapper<LawsHomeNormalSearchDTO> queryWrapper = new QueryWrapper<>();
         queryWrapper.select("id,standard_name,id,resource_type,standard_name," +
                 "create_time,standard_type_order,standard_state_order,standard_class," +
-                "dynamic_type,applicable_vehicle,standard_property," +
+                "dynamic_type,applicable_vehicle," +
                 "standard_state,standard_code,grade_classification,implementation_date, " + select);
 
         queryWrapper.and(s->s.apply("standard_name REGEXP '" + regexp.toString() + "'"));
@@ -236,10 +236,12 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
         queryWrapper.gt(!StringUtils.isEmpty(lawsHomeNormalSearchDTO.getStandardClass()),"instr(concat(',',standard_class,','),concat(',','" + lawsHomeNormalSearchDTO.getStandardClass() + str,0);
         queryWrapper.gt(!StringUtils.isEmpty(lawsHomeNormalSearchDTO.getDynamicType()),"instr(concat(',',dynamic_type,','),concat(',','" + lawsHomeNormalSearchDTO.getDynamicType() + str,0);
         queryWrapper.gt(!StringUtils.isEmpty(lawsHomeNormalSearchDTO.getApplicableVehicle()),"instr(concat(',',applicable_vehicle,','),concat(',','" + lawsHomeNormalSearchDTO.getApplicableVehicle() + str,0);
-        queryWrapper.gt(!StringUtils.isEmpty(lawsHomeNormalSearchDTO.getStandardProperty()),"instr(concat(',',standard_property,','),concat(',','" + lawsHomeNormalSearchDTO.getStandardProperty() + str,0);
+        queryWrapper.gt(!StringUtils.isEmpty(lawsHomeNormalSearchDTO.getStandardProperty()),"instr(concat(',',type,','),concat(',','" + lawsHomeNormalSearchDTO.getStandardProperty() + str,0);
         queryWrapper.gt(!StringUtils.isEmpty(lawsHomeNormalSearchDTO.getStandardState()),"instr(concat(',',standard_state,','), concat(',','" + lawsHomeNormalSearchDTO.getStandardState() + str,0);
-        queryWrapper.gt(!StringUtils.isEmpty(lawsHomeNormalSearchDTO.getCategoryCode()),"instr(concat(',',category_code,','),concat(',','" + lawsHomeNormalSearchDTO.getCategoryCode() + str,0);
-        queryWrapper.gt(!StringUtils.isEmpty(lawsHomeNormalSearchDTO.getEnterpriseStandardState()),"instr(concat(',',standard_state,','),  concat(',','" + lawsHomeNormalSearchDTO.getEnterpriseStandardState() + str,0);
+        queryWrapper.gt(!StringUtils.isEmpty(lawsHomeNormalSearchDTO.getCategoryCode()),"instr(concat(',',standard_category_code,','),concat(',','" + lawsHomeNormalSearchDTO.getCategoryCode() + str,0);
+        queryWrapper.gt(!StringUtils.isEmpty(lawsHomeNormalSearchDTO.getEnterpriseStandardState()),"instr(concat(',',enterprise_standard_state,','),  concat(',','" + lawsHomeNormalSearchDTO.getEnterpriseStandardState() + str,0);
+        queryWrapper.gt(!StringUtils.isEmpty(lawsHomeNormalSearchDTO.getApplicableMarket()),"instr(concat(',',applicable_market,','),concat(',','" + lawsHomeNormalSearchDTO.getApplicableMarket() + str,0);
+
 //        queryWrapper.gt(!StringUtils.isEmpty(lawsHomeNormalSearchDTO.getGradeClassification()),"instr(concat(',',grade_classification,','),concat(',','" + lawsHomeNormalSearchDTO.getGradeClassification() + str,0);
 
         queryWrapper.orderByDesc("sort_index");
@@ -574,10 +576,11 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
         queryWrapper.gt(!StringUtils.isEmpty(lawsHomeNormalSearchDTO.getStandardClass()),"instr(concat(',',standard_class,','),concat(',','" + lawsHomeNormalSearchDTO.getStandardClass() + str,0);
         queryWrapper.gt(!StringUtils.isEmpty(lawsHomeNormalSearchDTO.getDynamicType()),"instr(concat(',',dynamic_type,','),concat(',','" + lawsHomeNormalSearchDTO.getDynamicType() + str,0);
         queryWrapper.gt(!StringUtils.isEmpty(lawsHomeNormalSearchDTO.getApplicableVehicle()),"instr(concat(',',applicable_vehicle,','),concat(',','" + lawsHomeNormalSearchDTO.getApplicableVehicle() + str,0);
-        queryWrapper.gt(!StringUtils.isEmpty(lawsHomeNormalSearchDTO.getStandardProperty()),"instr(concat(',',standard_property,','),concat(',','" + lawsHomeNormalSearchDTO.getStandardProperty() + str,0);
+        queryWrapper.gt(!StringUtils.isEmpty(lawsHomeNormalSearchDTO.getStandardProperty()),"instr(concat(',',type,','),concat(',','" + lawsHomeNormalSearchDTO.getStandardProperty() + str,0);
         queryWrapper.gt(!StringUtils.isEmpty(lawsHomeNormalSearchDTO.getStandardState()),"instr(concat(',',standard_state,','),concat(',','" + lawsHomeNormalSearchDTO.getStandardState() + str,0);
-        queryWrapper.gt(!StringUtils.isEmpty(lawsHomeNormalSearchDTO.getCategoryCode()),"instr(concat(',',category_code,','),concat(',','" + lawsHomeNormalSearchDTO.getCategoryCode() + str,0);
-        queryWrapper.gt(!StringUtils.isEmpty(lawsHomeNormalSearchDTO.getEnterpriseStandardState()),"instr(concat(',',standard_state,','),concat(',','" + lawsHomeNormalSearchDTO.getEnterpriseStandardState() + str,0);
+        queryWrapper.gt(!StringUtils.isEmpty(lawsHomeNormalSearchDTO.getCategoryCode()),"instr(concat(',',standard_category_code,','),concat(',','" + lawsHomeNormalSearchDTO.getCategoryCode() + str,0);
+        queryWrapper.gt(!StringUtils.isEmpty(lawsHomeNormalSearchDTO.getEnterpriseStandardState()),"instr(concat(',',enterprise_standard_state,','),concat(',','" + lawsHomeNormalSearchDTO.getEnterpriseStandardState() + str,0);
+        queryWrapper.gt(!StringUtils.isEmpty(lawsHomeNormalSearchDTO.getApplicableMarket()),"instr(concat(',',applicable_market,','),concat(',','" + lawsHomeNormalSearchDTO.getApplicableMarket() + str,0);
 //        queryWrapper.gt(!StringUtils.isEmpty(lawsHomeNormalSearchDTO.getGradeClassification()),"instr(concat(',',grade_classification,','),concat(',','" + lawsHomeNormalSearchDTO.getGradeClassification() + str,0);
 
         switch (lawsHomeNormalSearchDTO.getResourceType()){
@@ -648,12 +651,17 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
             obj.setStandardClass(list1);
         }
         // 动力类型
-        List<LawsHomeNormalSearchStatisticsObjVO> list2 = addLawsHomeNormalSearchStatistics(list, "POWER_TYPE_DOMESTIC", DYNAMIC_TYPE);
+        List<LawsHomeNormalSearchStatisticsObjVO> list2 = addLawsHomeNormalSearchStatistics(list, DYNAMIC_TYPE, DYNAMIC_TYPE);
         if(!CollectionUtils.isEmpty(list2)){
             obj.setDynamicType(list2);
         }
+        // 适用市场
+        List<LawsHomeNormalSearchStatisticsObjVO> list6 = addLawsHomeNormalSearchStatistics(list, "market_state", "applicable_market");
+        if(!CollectionUtils.isEmpty(list6)){
+            obj.setApplicableMarket(list6);
+        }
         // 适用车辆类型
-        List<LawsHomeNormalSearchStatisticsObjVO> list3 = addLawsHomeNormalSearchStatistics(list,"APPLICATIONS_DOMESTIC", APPLICABLE_VEHICLE);
+        List<LawsHomeNormalSearchStatisticsObjVO> list3 = addLawsHomeNormalSearchStatistics(list, APPLICABLE_VEHICLE, APPLICABLE_VEHICLE);
         if(!CollectionUtils.isEmpty(list3)){
             obj.setApplicableVehicle(list3);
         }
@@ -737,6 +745,9 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
         if(!StringUtils.isBlank(homeNormalSearchDTO.getCategoryCode())){
             mapDict.put(STANDARD_CATEGORY_CODE,homeNormalSearchDTO.getCategoryCode());
         }
+        if(!StringUtils.isBlank(homeNormalSearchDTO.getApplicableMarket())){
+            mapDict.put("applicableMarket",homeNormalSearchDTO.getApplicableMarket());
+        }
         if(!StringUtils.isBlank(homeNormalSearchDTO.getEnterpriseStandardState())){
             mapDict.put(ENTERPRISE_STANDARD_STATE,homeNormalSearchDTO.getEnterpriseStandardState());
         }
@@ -1040,11 +1051,12 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
         listField.add(RESOURCE_TYPE);
         listField.add(STANDARD_CLASS);
         listField.add(DYNAMIC_TYPE);
-        listField.add(APPLICABLE_VEHICLE);
-        listField.add(STANDARD_PROPERTY);
+        listField.add("applicable_vehicle");
+        listField.add("standard_property");
         listField.add(STANDARD_STATE);
         listField.add(CATEGORY_CODE);
         listField.add(ENTERPRISE_STANDARD_STATE);
+        listField.add("applicable_market");
 //        listField.add(GRADE_CLASSIFICATION);
         JSONObject jsonObject = new JSONObject();
         Map<String, Object> map = new HashMap<>();
@@ -1107,6 +1119,7 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
                 addVo(search, list1, "applicable_vehicle_aggs", APPLICABLE_VEHICLE);
                 addVo(search, list1, "standard_property_aggs", STANDARD_PROPERTY);
                 addVo(search, list1, standardStateAggs, STANDARD_STATE);
+                addVo(search, list1, "applicable_market_aggs", "applicable_market");
                 count1(list1,objVo);
                 break;
 //            case LawsHomeSearchCommon.LAWS_OVERSEAS_STANDARD:
@@ -1615,8 +1628,9 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
             obj.setStandardClass(lawsDomesticStandard.getStandardClass());
             obj.setDynamicType(lawsDomesticStandard.getDynamicType());
             obj.setApplicableVehicle(lawsDomesticStandard.getApplicableVehicle());
-            obj.setStandardProperty(lawsDomesticStandard.getStandardProperty());
+            obj.setStandardProperty(lawsDomesticStandard.getType());
             obj.setStandardState(lawsDomesticStandard.getStandardState());
+            obj.setApplicableMarket(lawsDomesticStandard.getApplicableMarket());
 //            obj.setPushRangeFlag(2);
 //            obj.setReleaseStatus("1");
             List<OSSFile> listFile = getOssFilesLawsDomesticStandard(lawsDomesticStandard);

laws-modules/src/main/java/com/jero/modules/laws/home/vo/LawsHomeAdvancedSearchExportExcelVO.java

@@ -41,7 +41,7 @@ public class LawsHomeAdvancedSearchExportExcelVO implements Serializable {
      * 发布日期
      */
     @ApiModelProperty(value = "发布日期")
-    @Excel(name = "发布日期", width = 20, format = "yyyy-MM-dd")
+//    @Excel(name = "发布日期", width = 20, format = "yyyy-MM-dd")
     private Date releaseDate;
 
     /**
@@ -53,13 +53,13 @@ public class LawsHomeAdvancedSearchExportExcelVO implements Serializable {
     /**
      * 在产车实施日期
      * */
-    @Excel(name = "新认证车实施日期", width = 20, format = "yyyy-MM-dd")
+    @Excel(name = "新认证车实施日期", width = 20)
     @ApiModelProperty(value = "新认证车实施日期")
     private java.lang.String newAuthImplDate;
     /**
      * 新车型实施日期
      * */
-    @Excel(name = "新生产车实施日期",  width = 20, format = "yyyy-MM-dd")
+    @Excel(name = "新生产车实施日期",  width = 20)
     @ApiModelProperty(value = "新生产车实施日期")
     private java.lang.String newProductImplDate;
     /**

laws-modules/src/main/java/com/jero/modules/laws/home/vo/LawsHomeNormalSearchStatisticsVO.java

@@ -24,6 +24,11 @@ public class LawsHomeNormalSearchStatisticsVO implements Serializable {
      */
     @ApiModelProperty(value = "动力类型 （数据字典 只有外来标准法规：POWER_TYPE_DOMESTIC） (全部传空)")
     private List<LawsHomeNormalSearchStatisticsObjVO> dynamicType;
+    /**
+     * 适用市场 （数据字典 只有外来标准法规：market_state） (全部传空)
+     */
+    @ApiModelProperty(value = "适用市场 （数据字典 只有外来标准法规：market_state） (全部传空)")
+    private List<LawsHomeNormalSearchStatisticsObjVO> applicableMarket;
     /**
      * 适用车辆类型 （数据字典 只有外来标准法规：APPLICATIONS_DOMESTIC） (全部传空)
      */

laws-modules/src/main/java/com/jero/modules/laws/home/vo/LawsHomeNormalSearchVO.java

@@ -53,6 +53,11 @@ public class LawsHomeNormalSearchVO implements Serializable {
      */
     @ApiModelProperty(value = "动力类型 （数据字典 只有外来标准法规：POWER_TYPE_DOMESTIC） (全部传空)")
     private String dynamicType;
+    /**
+     * 适用市场 （数据字典 只有外来标准法规：market_state） (全部传空)
+     */
+    @ApiModelProperty(value = "适用市场 （数据字典 只有外来标准法规：market_state） (全部传空)")
+    private String applicableMarket;
     /**
      * 适用车辆类型 （数据字典 只有外来标准法规：APPLICATIONS_DOMESTIC） (全部传空)
      */

laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsDomesticStandard.java

@@ -136,6 +136,10 @@ public class LawsDomesticStandard implements Serializable {
 	@Excel(name = "适用车型", width = 15)
     @ApiModelProperty(value = "适用车型")
     private java.lang.String applicableVehicle;
+    /**适用市场*/
+    @Excel(name = "适用市场", width = 15)
+    @ApiModelProperty(value = "适用市场")
+    private String applicableMarket;
 	/**动力类型*/
 	@Excel(name = "动力类型", width = 15)
     @ApiModelProperty(value = "动力类型")