fix(检验业务开通)：暂存

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/config/BizCustomDateSerializer.java

+package com.yeejoin.amos.boot.module.jyjc.biz.config;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+import org.apache.commons.lang3.StringUtils;
+import org.typroject.tyboot.core.foundation.utils.DateTimeUtil;
+
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Objects;
+
+/**
+ * @JsonComponent 会覆盖JsonFormat, 这里解析字段提升JsonFormat优先级
+ * <p>
+ * ProjectName: amos-boot-biz
+ * PackageName: com.yeejoin.amos.boot.module.jg.biz.config
+ *
+ * @author yangyang
+ * @version v1.0
+ * @date 2023/12/18 17:35
+ */
+public class BizCustomDateSerializer extends StdSerializer<Date> {
+
+    public BizCustomDateSerializer()
+    {
+        super(Date.class);
+    }
+
+    @Override
+    public void serialize(Date value, JsonGenerator jgen, SerializerProvider provider) throws IOException, JsonProcessingException {
+        try {
+            Class<?> clazz = jgen.getCurrentValue().getClass();
+            Field field = clazz.getDeclaredField(jgen.getOutputContext().getCurrentName());
+            if (Objects.equals(field.getType(), Date.class)) {
+                if (field.isAnnotationPresent(JsonFormat.class)) {
+                    String pattern = field.getAnnotation(JsonFormat.class).pattern();
+                    if (StringUtils.isNotBlank(pattern)) {
+                        SimpleDateFormat formatter = new SimpleDateFormat(pattern);
+                        jgen.writeString(formatter.format(value));
+                        return;
+                    }
+                }
+            }
+            jgen.writeString(defaultFormattedDate(value));
+        } catch (Exception e) {
+            jgen.writeString(defaultFormattedDate(value));
+        }
+    }
+
+    private String defaultFormattedDate(Date value) {
+        SimpleDateFormat formatter = new SimpleDateFormat(DateTimeUtil.ISO_DATE_HOUR24_MIN_SEC);
+        String formattedDate = formatter.format(value);
+        return formattedDate;
+    }
+
+}
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/config/BizJsonSerializerManage.java

+package com.yeejoin.amos.boot.module.jyjc.biz.config;
+
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import org.springframework.boot.jackson.JsonComponent;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Primary;
+import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
+import org.typroject.tyboot.core.rdbms.model.BaseModel;
+import org.typroject.tyboot.core.restful.config.BaseModelSerializer;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.Date;
+
+/**
+ * Created by yaohelang on 2019/1/18.
+ */
+@JsonComponent
+public class BizJsonSerializerManage {
+
+    @Bean
+    @Primary
+    public ObjectMapper jacksonObjectMapper(Jackson2ObjectMapperBuilder builder) {
+        ObjectMapper objectMapper = builder.createXmlMapper(false).build();
+
+        /**
+         * 序列换成json时,将所有的long变成string
+         * 因为js中得数字类型不能包含所有的java long值
+         */
+        /**
+         * 序列换成json时,将所有的long变成string
+         * 因为js中得数字类型不能包含所有的java long值
+         */
+        SimpleModule simpleModule = new SimpleModule();
+        simpleModule.addSerializer(Long.class, ToStringSerializer.instance);
+        simpleModule.addSerializer(Long.TYPE, ToStringSerializer.instance);
+
+        BizCustomDateSerializer customDateSerializer = new BizCustomDateSerializer();
+        simpleModule.addSerializer(Date.class,customDateSerializer);
+
+
+
+        //序列化将BigInteger转String类型
+        simpleModule.addSerializer(BigInteger.class, ToStringSerializer.instance);
+        //序列化将BigDecimal转String类型
+        simpleModule.addSerializer(BigDecimal.class, ToStringSerializer.instance);
+
+        simpleModule.addSerializer(BaseModel.class,new BaseModelSerializer());
+
+
+        objectMapper.registerModule(simpleModule);
+        return objectMapper;
+    }
+
+}
\ No newline at end of file

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

@@ -33,6 +33,7 @@ import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
@@ -275,12 +276,14 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
      * @author yangyang
      * @date 2023/12/15 15:14
      */
+    @Transactional(rollbackFor = Exception.class)
     public void doReceive(Map<String, Object> params) {
         execueFlow(params);
         // 执行接收业务
         String type = (String) params.get("type");
-        Long sequenceNbr = Long.parseLong((String) params.get("sequenceNbr"));
+        Long sequenceNbr = Long.parseLong(params.get("sequenceNbr") + "");
         JyjcInspectionApplicationModel inspectionApplicationModel = this.queryBySeq(sequenceNbr);
+        updateModelByInstanceId(inspectionApplicationModel.getProcessInstanceId(), MapBuilder.<String, Object>create().put("status", FlowStatusEnum.SUBMITTED.getCode() + "").build());
         List<JyjcInspectionApplicationEquipModel> applicationEquipModels = applicationEquipService.listApplicationEquipByApplicationSeq(sequenceNbr);
         if (inspectionApplicationModel == null || ValidationUtil.isEmpty(applicationEquipModels)) {
             log.warn("JyjcInspectionApplicationModel Not Found！");

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

@@ -327,11 +327,13 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
      * 接收/驳回通知检验单
      */
     public void execueFlow(Map<String, Object> params) {
+        String role = "";
+        String taskName = "流程结束";
         String op = params.get("op").toString();
         String instanceId = params.get("instanceId").toString();
         String comments = params.get("comments").toString();
         try {
-            AjaxResult ajaxResult = Workflow.taskClient.getTask(instanceId);
+            AjaxResult ajaxResult = Workflow.taskClient.getTaskNoAuth(instanceId);
             JSONObject dataObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
             String taskId = dataObject.getString("id");
             //组装信息
@@ -345,8 +347,20 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
             dto.setComment(comments);
             //执行流程
             AjaxResult ajaxResult1 = Workflow.taskClient.completeByTask(taskId, dto);
-            if (ObjectUtils.isEmpty(ajaxResult1)) {
-
+            // 查询下节点任务
+            JSONObject taskNoAuth = workFlowFeginService.getTaskNoAuth(instanceId);
+            if (!org.springframework.util.ObjectUtils.isEmpty(taskNoAuth.get("data"))) {
+                JSONObject nextTask = JSON.parseObject(JSON.toJSONString(taskNoAuth.get("data")));
+                String nextTaskId = nextTask.getString("id");
+                taskName = nextTask.getString("name");
+                AjaxResult taskGroupName = Workflow.taskClient.getTaskGroupName(nextTaskId);
+                JSONArray data = JSON.parseArray(JSON.toJSONString(taskGroupName.get("data")));
+                for (Object datum : data) {
+                    if (((Map) datum).containsKey("groupId")) {
+                        role = ((Map) datum).get("groupId").toString();
+                        continue;
+                    }
+                }
             }
             if (op.equals("0")) {
                 String originalDataId = params.get("originalDataId").toString();

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/dto/TzBaseUnitLicenceDto.java

 package com.yeejoin.amos.boot.module.ymt.api.dto;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -44,9 +45,11 @@ public class TzBaseUnitLicenceDto extends BaseDto {
     private String certNo;
 
     @ApiModelProperty(value = "有效期至")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date expiryDate;
 
     @ApiModelProperty(value = "发证日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date issueDate;
 
     @ApiModelProperty(value = "发证机关")