*）修改检验类型字段

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcInspectionApplicationMapper.xml

@@ -180,7 +180,8 @@
             tzjia.*,
             tbei.supervise_org_name AS superviseOrgName,
             tbei.use_unit AS applicationUnitName,
-            tbei.address AS address
+            tbei.address AS address,
+            (SELECT cdd.NAME from cb_data_dictionary cdd where cdd.code = tzjia.inspection_type and cdd.type = 'JYJC' limit 1) AS inspectionTypeName
         FROM
             tz_jyjc_inspection_application AS tzjia
                 LEFT JOIN tz_base_enterprise_info tbei ON tzjia.application_unit_code = tbei.use_code

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

@@ -70,6 +70,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
+import org.typroject.tyboot.core.foundation.utils.DateUtil;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
@@ -600,8 +601,16 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         jsonData.forEach(f -> {
             Object o = map.get(f.getKey());
             if (!ObjectUtils.isEmpty(o)) {
+                if (f.getKey().equals("applicationDate")){
+                    try {
+                        f.setValue(DateUtil.formatDate((Date) o, DateUtil.Y_M_D));
+                    } catch (Exception e) {
+                        throw new RuntimeException(e);
+                    }
+                } else {
                     f.setValue(o.toString());
                 }
+            }
         });
 
         if(!CollectionUtils.isEmpty(flowLogger)){
@@ -610,9 +619,9 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                 data.put("label", flowLogger.get(i).get("approvalStatue"));
                 data.put("operatingTime", flowLogger.get(i).get("operateDate"));
                 if(null != flowLogger.get(i).get("assignee")) {
-                    data.put("operater", ((Map<String, Object>) flowLogger.get(i).get("assignee")).get("orgNamesWithoutRole") + ":" + flowLogger.get(i).get("taskName"));
+                    data.put("operater", ((Map<String, Object>) flowLogger.get(i).get("assignee")).get("orgNamesWithoutRole") + "【" + flowLogger.get(i).get("taskName") + "】");
                 }else if(null != flowLogger.get(i).get("companyName")){
-                    data.put("operater", flowLogger.get(i).get("companyName") + ":" + flowLogger.get(i).get("taskName"));
+                    data.put("operater", flowLogger.get(i).get("companyName") + "【" + flowLogger.get(i).get("taskName") + "】");
                 }
                 records.add(data);
             }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/bigScreenDetail.json

 [
   { "key": "applicationNo", "label": "报检单号" , "type": "text"},
   { "key": "applicationDate", "label": "报检日期" , "type": "text"},
-  { "key": "inspectionType", "label": "检验类型" , "type": "text"},
+  { "key": "inspectionTypeName", "label": "检验类型" , "type": "text"},
   { "key": "applicationUnitName", "label": "申报单位名称" , "type": "text"},
   { "key": "applicationUnitCode", "label": "单位统一信用代码" , "type": "text"},
   { "key": "address", "label": "单位地址" , "type": "text"},