ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into secondStage

Browse Source 
# Conflicts:
#	laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java
#	laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/controller/EsInspectFlowController.java
#	laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/controller/ProcessEsInspectController.java
#	laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/entity/ProcessEsInspect.java
#	laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/mapper/xml/ProcessEsInspectMapper.xml
#	laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java
#	laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/ProcessEsInspectServiceImpl.java
#	laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/vo/ProcessEsInspectVO.java
#	laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java
#	laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanServiceImpl.java
#	laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbInfoController.java
#	laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java
#	laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectController.java
#	laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectMapper.xml
#	laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java
This commit is contained in:
梁琦涛
2023-11-30 17:46:16 +08:00
parent 8deefed5ab f6958adc1e
commit fc78c3c01f
15 changed files with 520 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java
+1 -1
View File
@@ -444,4 +444,4 @@ public class ActFlowCommonService {
updateWrapper.set(ProcessApprovalRecord::getFinishFlag, ProcessStatusEnum.WITHDRAWN.getValue());
processApprovalRecordService.update(updateWrapper);
}
}
}
laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/mapper/xml/ProcessEsInspectMapper.xml
+1 -1
View File
@@ -39,4 +39,4 @@
group by pesi.id) t
${ew.customSqlSegment}
</sql>
</mapper>
</mapper>
laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java
-10
View File
@@ -595,12 +595,8 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
JSONObject sort = new JSONObject();
Map<String,Object> issueTimeDesc = new HashMap<>();
Map<String,Object> issueTimeAsc = new HashMap<>();
Map<String,Object> issueTime = new HashMap<>();
issueTimeDesc.put("order","desc");
issueTimeAsc.put("order","asc");
issueTime.put(RESOURCE_TYPE,issueTimeAsc);
issueTime.put(STANDARD_TYPE,issueTimeDesc);
issueTime.put(CREATE_TIME,issueTimeDesc);
sort.putAll(issueTime);
IPage page = getIPage(searchContent, queryMapJsonAll, mapHighlight1,
@@ -905,11 +901,6 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
obj.setApplicableVehicle(lawsDomesticStandard.getApplicableVehicle());
obj.setStandardProperty(lawsDomesticStandard.getStandardProperty());
obj.setStandardState(lawsDomesticStandard.getStandardState());
if(Objects.equals(lawsDomesticStandard.getStandardClass(),"GB")){
obj.setStandardType("2");
}else if(Objects.equals(lawsDomesticStandard.getStandardClass(),"GB/T")){
obj.setStandardType("1");
}
List<OSSFile> listFile = getOssFilesLawsDomesticStandard(lawsDomesticStandard);
updateES(opType, obj, listFile, lawsDomesticStandard.getId());
}catch (Exception e){
@@ -1205,7 +1196,6 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
map.put(STANDARD_CODE,obj.getStandardCode());
map.put(ENTERPRISE_STANDARD_STATE,obj.getEnterpriseStandardState());
map.put(GRADE_CLASSIFICATION,obj.getGradeClassification());
map.put(STANDARD_TYPE,obj.getStandardType());
map.put(CREATE_TIME,new Date());
//添加es
JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(map));
laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java
+9
View File
@@ -61,6 +61,15 @@ public class LawsDomesticController {
return Result.OK(lawsCommonService.getCommonPage(parameterMap));
}
@AutoLog(value = "国内法规标准-高级检索")
@ApiOperation(value="国内法规标准-高级检索", notes="国内法规标准-高级检索")
@PostMapping(value = "/getCommonPageNoPermissions")
@ApiOperationSupport(order = 1)
public Result<IPage<Map<String,Object>>> getCommonPageNoPermissions(@RequestBody @ApiParam("标签管理") Map<String,Object> parameterMap) {
parameterMap.put(FieldCommon.MODULE, MODULE_VALUE);
return Result.OK(lawsCommonService.getCommonPage(parameterMap));
}
@AutoLog(value = "国内法规标准-获取列表表头")
@ApiOperation(value="国内法规标准-获取列表表头", notes="国内法规标准-获取列表表头")
@GetMapping(value = "getCommonHeader")
laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java
+9
View File
@@ -79,6 +79,15 @@ public class LawsEnterpriseController {
return Result.OK(lawsCommonService.getCommonPage(parameterMap));
}
@AutoLog(value = "企业法规标准-高级检索")
@ApiOperation(value="企业法规标准-高级检索", notes="企业法规标准-高级检索")
@PostMapping(value = "/getCommonPageNoPermissions")
@ApiOperationSupport(order = 1)
public Result<IPage<Map<String,Object>>> getCommonPageNoPermissions(@RequestBody @ApiParam("标签管理") Map<String,Object> parameterMap) {
parameterMap.put(FieldCommon.MODULE, MODULE_VALUE);
return Result.OK(lawsCommonService.getCommonPage(parameterMap));
}
@AutoLog(value = "企业法规标准-获取列表表头")
@ApiOperation(value="企业法规标准-获取列表表头", notes="企业法规标准-获取列表表头")
@GetMapping(value = "getCommonHeader")
laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java
+9
View File
@@ -61,6 +61,15 @@ public class LawsOverseasController {
return Result.OK(lawsCommonService.getCommonPage(parameterMap));
}
@AutoLog(value = "海外法规标准-高级检索")
@ApiOperation(value="海外法规标准-高级检索", notes="海外法规标准-高级检索")
@PostMapping(value = "/getCommonPageNoPermissions")
@ApiOperationSupport(order = 1)
public Result<IPage<Map<String,Object>>> getCommonPageNoPermissions(@RequestBody @ApiParam("标签管理") Map<String,Object> parameterMap) {
parameterMap.put(FieldCommon.MODULE, MODULE_VALUE);
return Result.OK(lawsCommonService.getCommonPage(parameterMap));
}
@AutoLog(value = "海外法规标准-获取列表表头")
@ApiOperation(value="海外法规标准-获取列表表头", notes="海外法规标准-获取列表表头")
@GetMapping(value = "getCommonHeader")