1.新增返回参数

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/entity/BaseEntity.java

@@ -15,7 +15,7 @@ import java.util.Date;
  * @author DELL
  */
 @Data
-public class BaseEntity implements Serializable{
+public class  BaseEntity implements Serializable{
 	
 	private static final long serialVersionUID = 1L;
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgChangeRegistrationName.java

@@ -2,10 +2,15 @@ package com.yeejoin.amos.boot.module.jg.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.module.jg.api.common.BizCustomDateSerializer;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.util.Date;
 
 /**
@@ -79,6 +84,8 @@ public class JgChangeRegistrationName extends BaseEntity {
     /**
      * 创建时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonSerialize(using = BizCustomDateSerializer.class)
 	@TableField("create_date")
     private Date createDate;
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/CommonController.java

@@ -189,8 +189,8 @@ public class CommonController extends BaseController {
 	public ResponseModel<Object> save(@RequestParam(value = "submitType", required = false) String submitType,
 									  @RequestBody Map<String, Object> map) {
 		ReginParams reginParams = getSelectedOrgInfo();
-		commonService.invokeBusinessProcess(submitType, map, reginParams);
-		return ResponseHelper.buildResponse("");
+		Object result = commonService.invokeBusinessProcess(submitType, map, reginParams);
+		return ResponseHelper.buildResponse(result);
 	}
 
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/ICommonService.java

@@ -42,5 +42,5 @@ public interface ICommonService {
 
     List<Map<String, Object>>  superviseBusinessCategory(String type);
 
-    void invokeBusinessProcess(String submitType, Map<String, Object> obj, ReginParams reginParams);
+    Object invokeBusinessProcess(String submitType, Map<String, Object> obj, ReginParams reginParams);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/CommonServiceImpl.java

@@ -530,7 +530,7 @@ public class CommonServiceImpl implements ICommonService {
 
 
     @Override
-    public void invokeBusinessProcess(String submitType, Map<String, Object> map, ReginParams reginParams) {
+    public Object invokeBusinessProcess(String submitType, Map<String, Object> map, ReginParams reginParams) {
         Map<String, Object> basicObj = (Map<String, Object>) map.get(basic);
         Map<String, Object> noticeObj = (Map<String, Object>) map.get(notice);
         Map<String, Object> techInfoObj = (Map<String, Object>) map.get(techInfo);
@@ -615,7 +615,7 @@ public class CommonServiceImpl implements ICommonService {
             noticeObj.put("receiveOrgCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
             provideMap.put(GMBG_PAGE_ID, noticeObj);
             JSONObject jsonObject = new JSONObject(provideMap);
-            jgChangeRegistrationNameService.save2(submitType, jsonObject);
+            return jgChangeRegistrationNameService.save2(submitType, jsonObject);
         } else if (type.equals(ApplicationFormTypeEnum.SBQY.getBusinessCode()) || type.equals(ApplicationFormTypeEnum.SBTY.getBusinessCode())) {
             noticeObj.put("submit", submitType);
             noticeObj.put("formType", "add");
@@ -623,6 +623,7 @@ public class CommonServiceImpl implements ICommonService {
             JSONObject jsonObject = new JSONObject(noticeObj);
             jgEnableDisableServiceImpl.saveOrUpdate(jsonObject, reginParams);
         }
+        return null;
     }
 
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgChangeRegistrationNameServiceImpl.java

@@ -112,13 +112,13 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
 
 
     @Transactional(rollbackFor = Exception.class)
-    public void save2(String submitType, JSONObject requestParam) {
+    public JgChangeRegistrationName save2(String submitType, JSONObject requestParam) {
         Map<String, JSONObject> jgRegistrationInfoMap = (Map<String, JSONObject>) JSONObject.parseObject(JSONObject.toJSONString(requestParam), Map.class);
-        this.save(submitType, jgRegistrationInfoMap);
+        return this.save(submitType, jgRegistrationInfoMap);
     }
 
 
-    public void save(String submitType, Map<String, JSONObject> jgRegistrationInfoMap) {
+    public JgChangeRegistrationName save(String submitType, Map<String, JSONObject> jgRegistrationInfoMap) {
         ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         String[] taskName = new String[]{"流程结束"};
         JSONObject jgRegistrationInfo = jgRegistrationInfoMap.get("jgRegistrationInfo");
@@ -131,7 +131,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
         }
         List<String> applyNoList = listResponseModel.getResult();
         if (CollectionUtils.isEmpty(applyNoList)) {
-            return;
+            return null;
         }
         List<ProcessTaskDTO> processTasks = new ArrayList<>();
         // 判断当前是否为提交
@@ -190,6 +190,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
         this.save(dto);
         // 创建代办
         this.createTaskModel(dto, taskName[0], submitType, nextUserIds);
+        return dto;
     }
 
     private String getReceiveCompanyCode(JgChangeRegistrationNameDto model) {