From e4a192d3e7c6f8411059f4bbaa0bfacbf7f3e707 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Sat, 7 Oct 2023 01:13:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A72.0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mdp/form/ctrl/FormDataController.java | 32 ++++---- .../com/mdp/form/service/FormDataService.java | 78 +++++++++---------- .../com/mdp/form/service/FormDefService.java | 4 +- 3 files changed, 57 insertions(+), 57 deletions(-) diff --git a/mdp-form/src/main/java/com/mdp/form/ctrl/FormDataController.java b/mdp-form/src/main/java/com/mdp/form/ctrl/FormDataController.java index a5d7fa1..98c7ce0 100644 --- a/mdp-form/src/main/java/com/mdp/form/ctrl/FormDataController.java +++ b/mdp-form/src/main/java/com/mdp/form/ctrl/FormDataController.java @@ -148,8 +148,8 @@ public class FormDataController { }) @RequestMapping(value="/add",method=RequestMethod.POST) public Result addFormData(@RequestBody FormData formData) { - if(StringUtils.isEmpty(formData.getFlowState())) { - formData.setFlowState("0"); + if(StringUtils.isEmpty(formData.getFstate())) { + formData.setFstate("0"); } FormDefVo formDefVo=formFieldService.getFormFieldFromCache(formData.getFormId()); @@ -165,8 +165,8 @@ public class FormDataController { formData.setCusername(user.getUsername()); formData.setDeptid(user.getDeptid()); formData.setDeptName(user.getDeptName()); - formData.setCreateTime(new Date()); - formData.setLastTime(new Date()); + formData.setCtime(new Date()); + formData.setLtime(new Date()); @@ -175,9 +175,9 @@ public class FormDataController { */ Map formDataMap=BaseUtils.toMap(formData); for (FormField field : formFields) { - Object pkValue= formDataMap.get(field.getFieldIdCamel()); - if("1".equals(field.getIsRequired()) && ObjectTools.isEmpty(pkValue)){ - return Result.error("field-required","%s不能为空",field.getFieldTitle()); + Object pkValue= formDataMap.get(field.getIdCamel()); + if("1".equals(field.getReq()) && ObjectTools.isEmpty(pkValue)){ + return Result.error("field-required","%s不能为空",field.getTitle()); } } String bizKey=formDataService.createBizKey(formFields,formData); @@ -215,16 +215,16 @@ public class FormDataController { if(formDataDb==null){ return Result.error("data-0","数据已不存在"); } - formData.setLastTime(new Date()); - if(formData.getCreateTime()==null) { - formData.setCreateTime(new Date()); + formData.setLtime(new Date()); + if(formData.getCtime()==null) { + formData.setCtime(new Date()); } User user=LoginUtils.getCurrentUserInfo(); formData.setUserid(user.getUserid()); - formData.setLastTime(new Date()); + formData.setLtime(new Date()); - if(StringUtils.isEmpty(formData.getFlowState())) { - formData.setFlowState("0"); + if(StringUtils.isEmpty(formData.getFstate())) { + formData.setFstate("0"); } FormDefVo formDefVo=formFieldService.getFormFieldFromCache(formData.getFormId()); @@ -237,9 +237,9 @@ public class FormDataController { */ Map formDataMap=BaseUtils.toMap(formData); for (FormField field : formFields) { - Object pkValue= formDataMap.get(field.getFieldIdCamel()); - if("1".equals(field.getIsRequired()) && ObjectTools.isEmpty(pkValue)){ - return Result.error("field-required","%s不能为空",field.getFieldTitle()); + Object pkValue= formDataMap.get(field.getIdCamel()); + if("1".equals(field.getReq()) && ObjectTools.isEmpty(pkValue)){ + return Result.error("field-required","%s不能为空",field.getTitle()); } } diff --git a/mdp-form/src/main/java/com/mdp/form/service/FormDataService.java b/mdp-form/src/main/java/com/mdp/form/service/FormDataService.java index 079edd2..b11e8df 100644 --- a/mdp-form/src/main/java/com/mdp/form/service/FormDataService.java +++ b/mdp-form/src/main/java/com/mdp/form/service/FormDataService.java @@ -77,13 +77,13 @@ public class FormDataService extends BaseService { public String createBizKey(List formFields,FormData formData){ List pks=new ArrayList<>(); - List pkFields=formFields.stream().filter(k->k.getIsBizKey().endsWith("1")).collect(Collectors.toList()); + List pkFields=formFields.stream().filter(k->k.getBkey().endsWith("1")).collect(Collectors.toList()); if(pkFields==null || pkFields.size()==0){//没有业务主键，则取id return ""; } Map formDataMap= BaseUtils.toMap(formData); FormField pk=pkFields.get(0); - String isBizKey=pk.getIsBizKey(); + String isBizKey=pk.getBkey(); if(isBizKey.startsWith("1")){ pks.add(formData.getCuserid()); } @@ -91,11 +91,11 @@ public class FormDataService extends BaseService { pks.add(formData.getDeptid()); } for (FormField pkField : pkFields) { - Object pkValue= formDataMap.get(pkField.getFieldIdCamel()); + Object pkValue= formDataMap.get(pkField.getIdCamel()); if(ObjectTools.isEmpty(pkValue)){ - throw new BizException(LangTips.errMsg("pk-field-required","%s不能为空",pkField.getFieldTitle())); + throw new BizException(LangTips.errMsg("pk-field-required","%s不能为空",pkField.getTitle())); } - pks.add((String) formDataMap.get(pkField.getFieldIdCamel())); + pks.add((String) formDataMap.get(pkField.getIdCamel())); } return pks.stream().collect(Collectors.joining(",")); } @@ -106,7 +106,7 @@ public class FormDataService extends BaseService { * @param formId * @param procInstId */ - public void updateFlowStateByProcInst(String flowState,String formId,String procInstId) { + public void updateFstateByProcInst(String flowState,String formId,String procInstId) { Map p=new HashMap<>(); p.put("flowState", flowState); p.put("formId", formId); @@ -119,15 +119,15 @@ public class FormDataService extends BaseService { * @param formData * @return */ - public int insertOrUpdate(FormDataVo formData, boolean checkFlowState) { + public int insertOrUpdate(FormDataVo formData, boolean checkFstate) { String formId=formData.getFormId(); FormDefVo formDefVo=formFieldService.getFormFieldFromCache(formId); String bizKey=this.createBizKey(formDefVo.getFormFields(), formData); formData.setBizKey(bizKey); if(StringUtils.isEmpty(formData.getId())){ formData.setId(this.createKey("id")); - formData.setCreateTime(new Date()); - formData.setLastTime(new Date()); + formData.setCtime(new Date()); + formData.setLtime(new Date()); FormData fd=this.getDbFormDataByBizKey(formId,formData.getBizKey()); if(fd!=null) { throw new BizException("exists-form-data-biz-key","bizKey","数据已经存在不能再添加"); @@ -135,20 +135,20 @@ public class FormDataService extends BaseService { return this.insert(formData); } }else{ - formData.setLastTime(new Date()); + formData.setLtime(new Date()); FormData fd=this.getDbFormDataByBizKey(formId,formData.getBizKey()); if(fd==null) {//如果通过bizKey查不出来 FormData fdObject=getById(formData.getId()); if(fdObject!=null) {//通过id可以查出来，通过bizKey查不出来，说明是修改了bizKey,可以更新 - if(checkFlowState) { - if("0".equals(fdObject.getFlowState())) { - formData.setLastTime(new Date()); + if(checkFstate) { + if("0".equals(fdObject.getFstate())) { + formData.setLtime(new Date()); return super.updateByPk(formData); }else { - if("1".equals(fdObject.getFlowState())) { + if("1".equals(fdObject.getFstate())) { throw new BizException("flow-state-error-001","审核中的数据不允许修改"); - }else if("2".equals(fdObject.getFlowState())) { + }else if("2".equals(fdObject.getFstate())) { throw new BizException("flow-state-error-002","审核完毕的数据不允许修改"); }else { throw new BizException("flow-state-error-003","数据状态不正确"); @@ -156,14 +156,14 @@ public class FormDataService extends BaseService { } }else { - formData.setLastTime(new Date()); + formData.setLtime(new Date()); return super.updateByPk(formData); } }else {//通过id也查不出来，通过bizKey查不出来，说明是新增 - formData.setCreateTime(new Date()); - formData.setLastTime(new Date()); - if(StringUtils.isEmpty(formData.getFlowState())) { - formData.setFlowState("0"); + formData.setCtime(new Date()); + formData.setLtime(new Date()); + if(StringUtils.isEmpty(formData.getFstate())) { + formData.setFstate("0"); } return this.insert(formData); } @@ -172,21 +172,21 @@ public class FormDataService extends BaseService { //如果id相同，说明是同一条数据 if(fd.getId().equals(formData.getId())) { - if(checkFlowState) { - if("0".equals(fd.getFlowState())) { - formData.setLastTime(new Date()); + if(checkFstate) { + if("0".equals(fd.getFstate())) { + formData.setLtime(new Date()); return super.updateByPk(formData); }else { - if("1".equals(fd.getFlowState())) { + if("1".equals(fd.getFstate())) { throw new BizException("flow-state-error-001","审核中的数据不允许修改"); - }else if("2".equals(fd.getFlowState())) { + }else if("2".equals(fd.getFstate())) { throw new BizException("flow-state-error-002","审核完毕的数据不允许修改"); }else { throw new BizException("flow-state-error-003","数据状态不正确"); } } }else { - formData.setLastTime(new Date()); + formData.setLtime(new Date()); return super.updateByPk(formData); } }else {//如果id不相同，说明不是同一条数据 @@ -202,7 +202,7 @@ public class FormDataService extends BaseService { * 不检查数据状态 * @param formDatas */ - public void batchInsertOrUpdate(List formDatas,boolean updateFlowState) { + public void batchInsertOrUpdate(List formDatas,boolean updateFstate) { String formId=formDatas.get(0).getFormId(); FormDefVo fromDefVo=this.formFieldService.getFormFieldFromCache(formId); @@ -221,12 +221,12 @@ public class FormDataService extends BaseService { if(fd==null) {//如果通过bizKey查不出来 FormData fdObject=this.getById(formData.getId()); if(fdObject!=null) {//通过id可以查出来，通过bizKey查不出来，说明是修改了bizKey,可以更新 - formData.setLastTime(new Date()); + formData.setLtime(new Date()); needUpdateList.add(formData); }else {//通过id也查不出来，通过bizKey查不出来，说明是新增 - formData.setCreateTime(new Date()); - formData.setLastTime(new Date()); - formData.setFlowState("1"); + formData.setCtime(new Date()); + formData.setLtime(new Date()); + formData.setFstate("1"); needInsertList.add(formData); } @@ -234,7 +234,7 @@ public class FormDataService extends BaseService { //如果id相同，说明是同一条数据 if(fd.getId().equals(formData.getId())) { - formData.setLastTime(new Date()); + formData.setLtime(new Date()); needUpdateList.add(formData); }else {//如果id不相同，说明不是同一条数据 throw new BizException("form-data-biz-key-exists","数据已经存在，不能继续添加，请检查是否关键数据错误"); @@ -248,11 +248,11 @@ public class FormDataService extends BaseService { } if(needUpdateList.size()>0) { - if(updateFlowState) { + if(updateFstate) { this.updateBatchById(formDatas.stream().map(k->(FormData)k).collect(Collectors.toList())); }else { this.updateBatchById(formDatas.stream().map(k->{ - k.setFlowState(null); + k.setFstate(null); return (FormData)k; }).collect(Collectors.toList())); @@ -303,7 +303,7 @@ public class FormDataService extends BaseService { for (String fieldId : fieldIds.split(",")) { Object value=formDatasMap.get(fieldId); needUpdateFormDataMap.put(fieldId, value); - if(formDefVo.getFormFields().stream().filter(k->k.getFieldIdCamel().equals(fieldId)).findAny().isPresent()){ + if(formDefVo.getFormFields().stream().filter(k->k.getIdCamel().equals(fieldId)).findAny().isPresent()){ needUpdateBizKey=true; } } @@ -331,7 +331,7 @@ public class FormDataService extends BaseService { if(StringUtils.isEmpty(formDataVo.getId())) { formDataVo.setId(this.createKey("id")); } - formDataVo.setFlowState("1"); + formDataVo.setFstate("1"); formDatas.add(formDataVo); FormDataProcessApprova approva=BaseUtils.fromMap(flowVars, FormDataProcessApprova.class); @@ -347,13 +347,13 @@ public class FormDataService extends BaseService { } }else if("PROCESS_COMPLETED".equals(eventName)) { if("1".equals(agree)) { - this.updateFlowStateByProcInst("2", formId, procInstId); + this.updateFstateByProcInst("2", formId, procInstId); }else { - this.updateFlowStateByProcInst("3", formId, procInstId); + this.updateFstateByProcInst("3", formId, procInstId); } }else if("PROCESS_CANCELLED".equals(eventName)) { - this.updateFlowStateByProcInst("4", formId, procInstId); + this.updateFstateByProcInst("4", formId, procInstId); } } } diff --git a/mdp-form/src/main/java/com/mdp/form/service/FormDefService.java b/mdp-form/src/main/java/com/mdp/form/service/FormDefService.java index b43e691..269f763 100644 --- a/mdp-form/src/main/java/com/mdp/form/service/FormDefService.java +++ b/mdp-form/src/main/java/com/mdp/form/service/FormDefService.java @@ -102,7 +102,7 @@ public class FormDefService extends BaseService { List formFields=formDefVo.getFormFields(); for (FormField formField : formFields) { - String fieldBizKey=formField.getIsBizKey(); + String fieldBizKey=formField.getBkey(); if(StringUtils.isEmpty(fieldBizKey) ) { throw new BizException("is-biz-key-err-001", "isBizKey", "表单字段定义的主键编码错误，长度应为3位 格式位 111 第一位代表创建人是否为主键，第二位代表创建部门是否为主键，第三位代表该字段是否为主键"); }else if( fieldBizKey.length()!=3) { @@ -131,7 +131,7 @@ public class FormDefService extends BaseService { formDef.setDeptid(user.getDeptid()); formDef.setDeptName(user.getDeptName()); for (FormField formField : formFields) { - String fieldBizKey=formField.getIsBizKey(); + String fieldBizKey=formField.getBkey(); if(StringUtils.isEmpty(fieldBizKey) ) { throw new BizException("is-biz-key-err-001", "isBizKey", "表单字段定义的主键编码错误，长度应为3位 格式位 111 第一位代表创建人是否为主键，第二位代表创建部门是否为主键，第三位代表该字段是否为主键"); }else if( fieldBizKey.length()!=3) {