Merge remote-tracking branch 'origin/master'

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/workContract/domain/WorkContractInfo.java

@@ -73,6 +73,8 @@ public class WorkContractInfo extends BaseEntity {
      */
     private String contractFee;
 
+    private String fees;
+
     /**
      * 描述
      */
@@ -118,6 +120,8 @@ public class WorkContractInfo extends BaseEntity {
      */
     private String procInsId;
 
+    private String processDefinitionId;
+
     /**
      * 状态
      */

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/workContract/mapper/xml/WorkContractInfoMapper.xml

@@ -22,6 +22,7 @@
 			a.contract_amount,
 			a.contract_opposite,
 			a.contract_fee,
+			a.fees,
 			a.describes,
 			a.contract_special,
 			a.remarks,
@@ -31,6 +32,7 @@
 			a.confirm_filed_no,
 			a.filed_remarks,
 			a.proc_ins_id,
+			a.process_definition_id,
 			a.status,
 			a.filed_type,
 			a.borrow_type
@@ -56,6 +58,7 @@
 			contract_amount,
 			contract_opposite,
 			contract_fee,
+			fees,
 			describes,
 			contract_special,
 			remarks,

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/workContract/service/WorkContractService.java

@@ -41,8 +41,6 @@ public class WorkContractService {
     @Resource
     private SerialnumTplService serialnumTplService;
 
-    private final String BIZ_CODE = "htdj";
-
     public String saveInfo(WorkContractInfoDto workContractInfoDto) throws Exception {
         if (StringUtils.isNotEmpty(workContractInfoDto.getId())) {
             WorkContractInfo info = workContractInfoMapper.selectById(workContractInfoDto.getId());
@@ -86,7 +84,7 @@ public class WorkContractService {
         //获取当前登录人信息
         UserDTO userDTO = UserUtils.getCurrentUserDTO();
         //合同编号生成
-        String serialNum = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), BIZ_CODE);
+        String serialNum = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), WorkContractInfoDto.BIZ_CODE);
         String id = UUID.randomUUID().toString().replace("-", "");
         WorkContractInfo info = new WorkContractInfo();
         BeanUtils.copyProperties(workContractInfoDto, info);
@@ -112,7 +110,7 @@ public class WorkContractService {
         //获取当前登录人信息
         UserDTO userDTO = UserUtils.getCurrentUserDTO();
         //合同编号生成
-        String serialNum = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), BIZ_CODE);
+        String serialNum = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), WorkContractInfoDto.BIZ_CODE);
         WorkContractInfo info = new WorkContractInfo();
         BeanUtils.copyProperties(workContractInfoDto, info);
         info.setNo(serialNum);

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/workContract/service/dto/WorkContractInfoDto.java

@@ -9,6 +9,9 @@ import java.util.List;
 @Data
 public class WorkContractInfoDto extends BaseDTO {
 
+    //合同编号类型（字典值）
+    public static final String BIZ_CODE = "2";
+
     /**
      * 客户id
      */
@@ -69,6 +72,8 @@ public class WorkContractInfoDto extends BaseDTO {
      */
     private String contractFee;
 
+    private String fees;
+
     /**
      * 描述
      */

jeeplus-plugins/jeeplus-flowable/src/main/java/com/jeeplus/flowable/controller/FlowableProcessController.java

@@ -20,6 +20,8 @@ import javax.xml.stream.XMLStreamException;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -35,6 +37,27 @@ public class FlowableProcessController {
     @Autowired
     private FlowProcessService flowProcessService;
 
+
+
+    /**
+     * 流程定义列表
+     */
+    @GetMapping("getByName")
+    public ResponseEntity getByName( Page<Map> page,String name) {
+        /*
+         * 保存两个对象，一个是ProcessDefinition（流程定义），一个是Deployment（流程部署）
+         */
+        page = flowProcessService.processList(page, "");
+        List<Map> records = page.getRecords();
+        Map resultMap = new HashMap();
+        for (Map map : records) {
+            if(name.equals(map.get("name"))){
+                resultMap = map;
+            }
+        }
+        return ResponseEntity.ok ( resultMap );
+    }
+
     /**
      * 流程定义列表
      */

jeeplus-plugins/jeeplus-flowable/src/main/java/com/jeeplus/flowable/controller/FlowableTaskController.java

@@ -165,7 +165,7 @@ public class FlowableTaskController {
      */
     @PostMapping("start")
     public ResponseEntity start(@RequestBody  Flow flow)  {
-        String procInsId = flowTaskService.startProcess(flow.getProcDefKey(), flow.getBusinessTable(), flow.getBusinessId(), flow.getTitle());
+        String procInsId = flowTaskService.startProcess(flow.getProcDefKey(), flow.getBusinessTable(), flow.getBusinessId(), flow.getTitle(), flow.getProcDefId());
 
         //指定下一步处理人
         if(StringUtils.isNotBlank(flow.getAssignee ())){

jeeplus-plugins/jeeplus-flowable/src/main/java/com/jeeplus/flowable/mapper/xml/FlowMapper.xml

@@ -5,6 +5,9 @@
 	<update id="updateProcInsIdByBusinessId">
 		UPDATE ${businessTable} SET
 			proc_ins_id = #{procInsId}
+		<if test="procDefId != null and procDefId != ''">
+			,process_definition_id = #{procDefId}
+		</if>
 		WHERE id = #{businessId}
 	</update>
 

jeeplus-plugins/jeeplus-flowable/src/main/java/com/jeeplus/flowable/service/FlowTaskService.java

@@ -349,9 +349,9 @@ public class FlowTaskService {
      * @param title         流程标题，显示在待办任务标题
      * @return 流程实例ID
      */
-    public String startProcess(String procDefKey, String businessTable, String businessId, String title) {
+    public String startProcess(String procDefKey, String businessTable, String businessId, String title, String procDefId) {
         Map<String, Object> vars = Maps.newHashMap ();
-        return startProcess (procDefKey, businessTable, businessId, title, vars);
+        return startProcess (procDefKey, businessTable, businessId, title, vars, procDefId);
     }
 
     /**
@@ -365,7 +365,7 @@ public class FlowTaskService {
      * @return 流程实例ID
      */
     @SuppressWarnings("unused")
-    public String startProcess(String procDefKey, String businessTable, String businessId, String title, Map<String, Object> vars) {
+    public String startProcess(String procDefKey, String businessTable, String businessId, String title, Map<String, Object> vars, String procDefId) {
         //String userId = UserUtils.getUser().getLoginName();//ObjectUtils.toString(UserUtils.getUser().getId())
         // 设置流程变量
         if (vars == null) {
@@ -395,6 +395,7 @@ public class FlowTaskService {
         act.setBusinessTable (businessTable);// 业务表名
         act.setBusinessId (businessId);  // 业务表ID
         act.setProcInsId (procIns.getId ());
+        act.setProcDefId(procDefId);
         act.setVars (vars);
         flowMapper.updateProcInsIdByBusinessId (act);
         return act.getProcInsId ();