diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java index 65dfe339..9fa0ea3d 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java @@ -39,11 +39,14 @@ import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService; import com.jero.modules.laws.standard.service.ILawsOverseasStandardService; import com.jero.modules.laws.standardization.entity.LawsStandardization; import com.jero.modules.laws.standardization.service.ILawsStandardizationService; +import com.jero.modules.system.entity.SysDepart; +import com.jero.modules.system.service.ISysDepartService; import com.jero.modules.system.service.ISysDictService; import com.jero.modules.system.service.ISysUserService; import com.jero.modules.tag.entity.LawsTag; import com.jero.modules.tag.enums.TableNameEnum; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -85,6 +88,9 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl sysDepartList = sysDepartService.listByIds(Arrays.asList(String.valueOf(read.toString()).split(","))); + jsonObject.put("responsible_department_dictText", CollectionUtils.isNotEmpty(sysDepartList) ? + sysDepartList.stream().map(SysDepart::getDepartName).collect(Collectors.joining(",")) : ""); + } + // 企业参与情况 + if (businessJson.contains("enterprise_participation")){ + Object read = JSONPath.read(businessJson, "$.enterprise_participation"); + String text = dictService.queryDictText("yn", read.toString()); + jsonObject.put("enterprise_participation_dictText", text); + } + // 适用认证 + if (businessJson.contains("applicable_certification")){ + Object read = JSONPath.read(businessJson, "$.applicable_certification"); + String text = dictService.queryDictText("applicable_certification", read.toString()); + jsonObject.put("applicable_certification_dictText", text); + } processFbEntryChange.setBusinessJson(jsonObject.toJSONString()); } @Override @@ -506,4 +572,10 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl() .eq(ProcessFbEntryChange::getId, processAll.getProjectId())); } + + public static void main(String[] args) { + for (int i = 0; i < 103; i++) { + System.out.println(i); + } + } }