diff --git a/mdp-lcode-bootstrap/src/main/resources/logback-spring.xml b/mdp-lcode-bootstrap/src/main/resources/logback-spring.xml index a5c7a1e..7b32990 100644 --- a/mdp-lcode-bootstrap/src/main/resources/logback-spring.xml +++ b/mdp-lcode-bootstrap/src/main/resources/logback-spring.xml @@ -10,9 +10,9 @@ - logs/mdp_form.log + logs/mdp_lcode.log - logs/mdp_form.%d{yyyy-MM-dd}.%i.log + logs/mdp_lcode.%d{yyyy-MM-dd}.%i.log 20 100MB diff --git a/mdp-lcode/src/main/java/com/mdp/lcode/ctrl/FormDataProcessApprovaController.java b/mdp-lcode/src/main/java/com/mdp/lcode/ctrl/FormDataProcessApprovaController.java index 57196b0..dc33b4c 100644 --- a/mdp-lcode/src/main/java/com/mdp/lcode/ctrl/FormDataProcessApprovaController.java +++ b/mdp-lcode/src/main/java/com/mdp/lcode/ctrl/FormDataProcessApprovaController.java @@ -24,7 +24,7 @@ import com.mdp.swagger.ApiEntityParams; import springfox.documentation.annotations.ApiIgnore; import com.mdp.lcode.service.FormDataProcessApprovaService; -import com.mdp.lcode.entity.FormDataProcessApprova; +import com.mdp.lcode.entity.FormDataFlow; @RestController @RequestMapping(value="/**/form/formDataProcessApprova") @@ -37,15 +37,15 @@ public class FormDataProcessApprovaController { private FormDataProcessApprovaService formDataProcessApprovaService; @ApiOperation( value = "企业入驻审核流程-查询列表",notes=" ") - @ApiEntityParams(FormDataProcessApprova.class) + @ApiEntityParams(FormDataFlow.class) @ApiResponses({ - @ApiResponse(code = 200,response=FormDataProcessApprova.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}") + @ApiResponse(code = 200,response= FormDataFlow.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/list",method=RequestMethod.GET) public Result listFormDataProcessApprova(@ApiIgnore @RequestParam Map params){ try { User user=LoginUtils.getCurrentUserInfo(); - QueryWrapper qw = QueryTools.initQueryWrapper(FormDataProcessApprova.class , params); + QueryWrapper qw = QueryTools.initQueryWrapper(FormDataFlow.class , params); IPage page=QueryTools.initPage(params); List> datas = formDataProcessApprovaService.selectListMapByWhere(page,qw,params); return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal()); @@ -59,10 +59,10 @@ public class FormDataProcessApprovaController { @ApiOperation( value = "企业入驻审核流程-新增",notes=" ") @ApiResponses({ - @ApiResponse(code = 200,response=FormDataProcessApprova.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}") + @ApiResponse(code = 200,response= FormDataFlow.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}") }) @RequestMapping(value="/add",method=RequestMethod.POST) - public Result addFormDataProcessApprova(@RequestBody FormDataProcessApprova formDataProcessApprova) { + public Result addFormDataProcessApprova(@RequestBody FormDataFlow formDataProcessApprova) { formDataProcessApprovaService.save(formDataProcessApprova); return Result.ok("add-ok","添加成功!"); } @@ -72,25 +72,25 @@ public class FormDataProcessApprovaController { @ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}}") }) @RequestMapping(value="/del",method=RequestMethod.POST) - public Result delFormDataProcessApprova(@RequestBody FormDataProcessApprova formDataProcessApprova){ + public Result delFormDataProcessApprova(@RequestBody FormDataFlow formDataProcessApprova){ formDataProcessApprovaService.removeById(formDataProcessApprova); return Result.ok("del-ok","删除成功!"); } @ApiOperation( value = "企业入驻审核流程-修改",notes=" ") @ApiResponses({ - @ApiResponse(code = 200,response=FormDataProcessApprova.class, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}") + @ApiResponse(code = 200,response= FormDataFlow.class, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}") }) @RequestMapping(value="/edit",method=RequestMethod.POST) - public Result editFormDataProcessApprova(@RequestBody FormDataProcessApprova formDataProcessApprova) { + public Result editFormDataProcessApprova(@RequestBody FormDataFlow formDataProcessApprova) { formDataProcessApprovaService.updateById(formDataProcessApprova); return Result.ok("edit-ok","修改成功!"); } @ApiOperation( value = "企业入驻审核流程-批量修改某些字段",notes="") - @ApiEntityParams( value = FormDataProcessApprova.class, props={ }, remark = "企业入驻审核流程", paramType = "body" ) + @ApiEntityParams( value = FormDataFlow.class, props={ }, remark = "企业入驻审核流程", paramType = "body" ) @ApiResponses({ - @ApiResponse(code = 200,response=FormDataProcessApprova.class, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}") + @ApiResponse(code = 200,response= FormDataFlow.class, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}") }) @RequestMapping(value="/editSomeFields",method=RequestMethod.POST) public Result editSomeFields( @ApiIgnore @RequestBody Map params) { @@ -112,17 +112,17 @@ public class FormDataProcessApprovaController { @ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}") }) @RequestMapping(value="/batchDel",method=RequestMethod.POST) - public Result batchDelFormDataProcessApprova(@RequestBody List formDataProcessApprovas) { + public Result batchDelFormDataProcessApprova(@RequestBody List formDataProcessApprovas) { User user= LoginUtils.getCurrentUserInfo(); try{ if(formDataProcessApprovas.size()<=0){ return Result.error("formDataProcessApprova-batchDel-data-err-0","请上送待删除数据列表"); } - List datasDb=formDataProcessApprovaService.listByIds(formDataProcessApprovas.stream().map(i-> i.getId() ).collect(Collectors.toList())); + List datasDb=formDataProcessApprovaService.listByIds(formDataProcessApprovas.stream().map(i-> i.getId() ).collect(Collectors.toList())); - List can=new ArrayList<>(); - List no=new ArrayList<>(); - for (FormDataProcessApprova data : datasDb) { + List can=new ArrayList<>(); + List no=new ArrayList<>(); + for (FormDataFlow data : datasDb) { if(true){ can.add(data); }else{ @@ -154,11 +154,11 @@ public class FormDataProcessApprovaController { @ApiOperation( value = "企业入驻审核流程-根据主键查询一条数据",notes=" ") @ApiResponses({ - @ApiResponse(code = 200,response=FormDataProcessApprova.class, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}") + @ApiResponse(code = 200,response= FormDataFlow.class, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}") }) @RequestMapping(value="/queryById",method=RequestMethod.GET) - public Result queryById(FormDataProcessApprova formDataProcessApprova) { - FormDataProcessApprova data = (FormDataProcessApprova) formDataProcessApprovaService.getById(formDataProcessApprova); + public Result queryById(FormDataFlow formDataProcessApprova) { + FormDataFlow data = (FormDataFlow) formDataProcessApprovaService.getById(formDataProcessApprova); return Result.ok().setData(data); } diff --git a/mdp-lcode/src/main/java/com/mdp/lcode/entity/FormDataProcessApprova.java b/mdp-lcode/src/main/java/com/mdp/lcode/entity/FormDataFlow.java similarity index 94% rename from mdp-lcode/src/main/java/com/mdp/lcode/entity/FormDataProcessApprova.java rename to mdp-lcode/src/main/java/com/mdp/lcode/entity/FormDataFlow.java index 2d6bd57..40f45d6 100644 --- a/mdp-lcode/src/main/java/com/mdp/lcode/entity/FormDataProcessApprova.java +++ b/mdp-lcode/src/main/java/com/mdp/lcode/entity/FormDataFlow.java @@ -15,9 +15,9 @@ import java.util.Date; * id;
*/ @Data -@TableName("form_data_process_approva") -@ApiModel(description="企业入驻审核流程") -public class FormDataProcessApprova implements java.io.Serializable { +@TableName("form_data_flow") +@ApiModel(description="表单数据与流程关联表") +public class FormDataFlow implements java.io.Serializable { private static final long serialVersionUID = 1L; @TableId(type = IdType.ASSIGN_ID) @@ -87,14 +87,14 @@ public class FormDataProcessApprova implements java.io.Serializable { /** *主键 **/ - public FormDataProcessApprova(String id) { + public FormDataFlow(String id) { this.id = id; } /** * 企业入驻审核流程 **/ - public FormDataProcessApprova() { + public FormDataFlow() { } } \ No newline at end of file diff --git a/mdp-lcode/src/main/java/com/mdp/lcode/mapper/FormDataProcessApprovaMapper.java b/mdp-lcode/src/main/java/com/mdp/lcode/mapper/FormDataProcessApprovaMapper.java index 416e9a0..ec62712 100644 --- a/mdp-lcode/src/main/java/com/mdp/lcode/mapper/FormDataProcessApprovaMapper.java +++ b/mdp-lcode/src/main/java/com/mdp/lcode/mapper/FormDataProcessApprovaMapper.java @@ -8,9 +8,9 @@ import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; -import com.mdp.lcode.entity.FormDataProcessApprova; +import com.mdp.lcode.entity.FormDataFlow; -public interface FormDataProcessApprovaMapper extends BaseMapper { +public interface FormDataProcessApprovaMapper extends BaseMapper { /** * 自定义查询,支持多表关联 diff --git a/mdp-lcode/src/main/java/com/mdp/lcode/service/FormDataProcessApprovaService.java b/mdp-lcode/src/main/java/com/mdp/lcode/service/FormDataProcessApprovaService.java index 8eb25b8..6ed6da4 100644 --- a/mdp-lcode/src/main/java/com/mdp/lcode/service/FormDataProcessApprovaService.java +++ b/mdp-lcode/src/main/java/com/mdp/lcode/service/FormDataProcessApprovaService.java @@ -9,7 +9,7 @@ import java.util.Map; import org.springframework.stereotype.Service; import com.mdp.core.service.BaseService; -import com.mdp.lcode.entity.FormDataProcessApprova; +import com.mdp.lcode.entity.FormDataFlow; import com.mdp.lcode.mapper.FormDataProcessApprovaMapper; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
@@ -17,7 +17,7 @@ import com.mdp.lcode.mapper.FormDataProcessApprovaMapper; * 实体 FormDataProcessApprova 表 form_data_process_approva 当前主键(包括多主键): id; ***/ @Service -public class FormDataProcessApprovaService extends BaseService { +public class FormDataProcessApprovaService extends BaseService { static Logger logger =LoggerFactory.getLogger(FormDataProcessApprovaService.class); /** diff --git a/mdp-lcode/src/main/java/com/mdp/lcode/service/FormDataService.java b/mdp-lcode/src/main/java/com/mdp/lcode/service/FormDataService.java index afa386b..0b65f14 100644 --- a/mdp-lcode/src/main/java/com/mdp/lcode/service/FormDataService.java +++ b/mdp-lcode/src/main/java/com/mdp/lcode/service/FormDataService.java @@ -357,7 +357,7 @@ public class FormDataService extends BaseService { if("PROCESS_STARTED".equals(eventName)) { Map formDatasMap=( Map) flowVars.get("formData"); List formDatas=new ArrayList<>(); - List approvas=new ArrayList<>(); + List approvas=new ArrayList<>(); if(formDatasMap!=null && formDatasMap.size()>0) { FormDataVo formDataVo=BaseUtils.fromMap(formDatasMap, FormDataVo.class); FormDefVo formDefVo=this.formFieldService.getFormFieldFromCache(formId); @@ -369,7 +369,7 @@ public class FormDataService extends BaseService { formDataVo.setFstate("1"); formDatas.add(formDataVo); - FormDataProcessApprova approva=BaseUtils.fromMap(flowVars, FormDataProcessApprova.class); + FormDataFlow approva=BaseUtils.fromMap(flowVars, FormDataFlow.class); approva.setBranchId(approva.getBranchId()); approva.setFormDataId(formDataVo.getId()); approva.setFormId(formDataVo.getFormId()); diff --git a/mdp-lcode/src/main/resources/logback-spring.xml b/mdp-lcode/src/main/resources/logback-spring.xml index d509318..a3a15e5 100644 --- a/mdp-lcode/src/main/resources/logback-spring.xml +++ b/mdp-lcode/src/main/resources/logback-spring.xml @@ -10,9 +10,9 @@ - logs/mdp_form.log + logs/mdp_lcode.log - logs/mdp_form.%d{yyyy-MM-dd}.%i.log + logs/mdp_lcode.%d{yyyy-MM-dd}.%i.log 20 100MB