diff --git a/casic-metering-api/src/main/resources/config/application-prod.yml b/casic-metering-api/src/main/resources/config/application-prod.yml index 5fe749d..b58b0d3 100644 --- a/casic-metering-api/src/main/resources/config/application-prod.yml +++ b/casic-metering-api/src/main/resources/config/application-prod.yml @@ -1,32 +1,53 @@ server: - port: 8082 -# context-path: /callcenter/api + port: 8088 ################### spring配置 ################### spring: datasource: - url: jdbc:mysql://111.198.10.15:11336/casic_metering?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&nullCatalogMeansCurrent=true + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://127.0.0.1:3001/casic_metering?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&nullCatalogMeansCurrent=true username: root - password: Casic203 - initial-size: 2 - min-idle: 1 - jms: - pub-sub-domain: true - # session: - # store-type: redis + password: Casic203xz redis: host: 127.0.0.1 port: 6379 password: - -#flowable数据源和多数据源配置 + database: 1 + serializer: org.springframework.data.redis.serializer.StringRedisSerializer + redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer +#jms: +# pub-sub-domain: true +# session: +# store-type: redis casic: - kaptcha-open: false #是否开启登录时验证码 (true/false) - nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken + #kaptcha-open: false #是否开启登录时验证码 (true/false) + no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/v2/api-docs,/v2/api-docs-ext,/doc.html,/cockpit/**,/websocket/**,/webjars/**,/swagger-ui.html,/swagger-resources,/minio/file/image/preview + #flowable数据源和多数据源配置 + db: + init: + enable: false #图片下载本地地址 file: - uploadPath: /tmp/ + uploadPath: D:\casic\tmp\ + dir: D:\casic\tmp\ + previewUrl: http://222.187.140.114:8896 + meter: + standardEquipment: #标准装置 + remindDay: 30 #到期提醒，提前天数 + delayDay: 30 #到期提醒-删除，提醒推迟天数 + template: + calibration: "现场检定审批报告" + environmental: "现场环境记录" + testOrder: "检测委托单" + testOrderExcel: "检测委托单excel" + calibrationOrder: "检定或校准委托单" + calibrationOrderExcel: "检定或校准委托单excel" + interchange: "设备交接单" + settlementTest: "检测项目结算单" + settlementCooperation: "合作机构结算单" + settlementCalibration: "校准费用结算单" logging: level.root: info level.com.casic: debug - level.org.springframework.web: info \ No newline at end of file + level.org.springframework.web: info +# level.org.flowable: debug #flowable日志，可查看SQL执行 \ No newline at end of file diff --git a/casic-metering-api/src/main/resources/config/application-prod.yml b/casic-metering-api/src/main/resources/config/application-prod.yml index 5fe749d..b58b0d3 100644 --- a/casic-metering-api/src/main/resources/config/application-prod.yml +++ b/casic-metering-api/src/main/resources/config/application-prod.yml @@ -1,32 +1,53 @@ server: - port: 8082 -# context-path: /callcenter/api + port: 8088 ################### spring配置 ################### spring: datasource: - url: jdbc:mysql://111.198.10.15:11336/casic_metering?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&nullCatalogMeansCurrent=true + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://127.0.0.1:3001/casic_metering?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&nullCatalogMeansCurrent=true username: root - password: Casic203 - initial-size: 2 - min-idle: 1 - jms: - pub-sub-domain: true - # session: - # store-type: redis + password: Casic203xz redis: host: 127.0.0.1 port: 6379 password: - -#flowable数据源和多数据源配置 + database: 1 + serializer: org.springframework.data.redis.serializer.StringRedisSerializer + redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer +#jms: +# pub-sub-domain: true +# session: +# store-type: redis casic: - kaptcha-open: false #是否开启登录时验证码 (true/false) - nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken + #kaptcha-open: false #是否开启登录时验证码 (true/false) + no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/v2/api-docs,/v2/api-docs-ext,/doc.html,/cockpit/**,/websocket/**,/webjars/**,/swagger-ui.html,/swagger-resources,/minio/file/image/preview + #flowable数据源和多数据源配置 + db: + init: + enable: false #图片下载本地地址 file: - uploadPath: /tmp/ + uploadPath: D:\casic\tmp\ + dir: D:\casic\tmp\ + previewUrl: http://222.187.140.114:8896 + meter: + standardEquipment: #标准装置 + remindDay: 30 #到期提醒，提前天数 + delayDay: 30 #到期提醒-删除，提醒推迟天数 + template: + calibration: "现场检定审批报告" + environmental: "现场环境记录" + testOrder: "检测委托单" + testOrderExcel: "检测委托单excel" + calibrationOrder: "检定或校准委托单" + calibrationOrderExcel: "检定或校准委托单excel" + interchange: "设备交接单" + settlementTest: "检测项目结算单" + settlementCooperation: "合作机构结算单" + settlementCalibration: "校准费用结算单" logging: level.root: info level.com.casic: debug - level.org.springframework.web: info \ No newline at end of file + level.org.springframework.web: info +# level.org.flowable: debug #flowable日志，可查看SQL执行 \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java index 65fb2ca..66993a0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -144,11 +144,11 @@ * 检定结果（字典code） */ @TableField("measure_result") - @ApiModelProperty(value = "检定结果（字典code）", dataType = "String") + @ApiModelProperty(value = "检定结果（前端直接填入）", dataType = "String") private String measureResult; @TableField(exist = false) - @ApiModelProperty(value = "检定结果（字典value）", dataType = "String") + @ApiModelProperty(value = "检定结果（废弃）", dataType = "String") private String measureResultName; @TableField("environment_id") diff --git a/casic-metering-api/src/main/resources/config/application-prod.yml b/casic-metering-api/src/main/resources/config/application-prod.yml index 5fe749d..b58b0d3 100644 --- a/casic-metering-api/src/main/resources/config/application-prod.yml +++ b/casic-metering-api/src/main/resources/config/application-prod.yml @@ -1,32 +1,53 @@ server: - port: 8082 -# context-path: /callcenter/api + port: 8088 ################### spring配置 ################### spring: datasource: - url: jdbc:mysql://111.198.10.15:11336/casic_metering?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&nullCatalogMeansCurrent=true + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://127.0.0.1:3001/casic_metering?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&nullCatalogMeansCurrent=true username: root - password: Casic203 - initial-size: 2 - min-idle: 1 - jms: - pub-sub-domain: true - # session: - # store-type: redis + password: Casic203xz redis: host: 127.0.0.1 port: 6379 password: - -#flowable数据源和多数据源配置 + database: 1 + serializer: org.springframework.data.redis.serializer.StringRedisSerializer + redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer +#jms: +# pub-sub-domain: true +# session: +# store-type: redis casic: - kaptcha-open: false #是否开启登录时验证码 (true/false) - nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken + #kaptcha-open: false #是否开启登录时验证码 (true/false) + no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/v2/api-docs,/v2/api-docs-ext,/doc.html,/cockpit/**,/websocket/**,/webjars/**,/swagger-ui.html,/swagger-resources,/minio/file/image/preview + #flowable数据源和多数据源配置 + db: + init: + enable: false #图片下载本地地址 file: - uploadPath: /tmp/ + uploadPath: D:\casic\tmp\ + dir: D:\casic\tmp\ + previewUrl: http://222.187.140.114:8896 + meter: + standardEquipment: #标准装置 + remindDay: 30 #到期提醒，提前天数 + delayDay: 30 #到期提醒-删除，提醒推迟天数 + template: + calibration: "现场检定审批报告" + environmental: "现场环境记录" + testOrder: "检测委托单" + testOrderExcel: "检测委托单excel" + calibrationOrder: "检定或校准委托单" + calibrationOrderExcel: "检定或校准委托单excel" + interchange: "设备交接单" + settlementTest: "检测项目结算单" + settlementCooperation: "合作机构结算单" + settlementCalibration: "校准费用结算单" logging: level.root: info level.com.casic: debug - level.org.springframework.web: info \ No newline at end of file + level.org.springframework.web: info +# level.org.flowable: debug #flowable日志，可查看SQL执行 \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java index 65fb2ca..66993a0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -144,11 +144,11 @@ * 检定结果（字典code） */ @TableField("measure_result") - @ApiModelProperty(value = "检定结果（字典code）", dataType = "String") + @ApiModelProperty(value = "检定结果（前端直接填入）", dataType = "String") private String measureResult; @TableField(exist = false) - @ApiModelProperty(value = "检定结果（字典value）", dataType = "String") + @ApiModelProperty(value = "检定结果（废弃）", dataType = "String") private String measureResultName; @TableField("environment_id") diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java index b513603..919de3a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java @@ -352,7 +352,7 @@ break; //全部 //区分管理员和普通用户 - //普通用户获取自己发起的(审批中、已通过、未通过、已取消)，管理员获取全部(审批中、已通过、未通过、已取消) + //普通用户获取自己发起的(审批中、已通过、未通过、已取消)及作为审批者的，管理员获取全部(审批中、已通过、未通过、已取消) case ApprovalStatusEnum.ALL: List AllApproveList = baseApprovalService.getAllList(request.getFormId()); if (!CollectionUtils.isEmpty(AllApproveList)) { diff --git a/casic-metering-api/src/main/resources/config/application-prod.yml b/casic-metering-api/src/main/resources/config/application-prod.yml index 5fe749d..b58b0d3 100644 --- a/casic-metering-api/src/main/resources/config/application-prod.yml +++ b/casic-metering-api/src/main/resources/config/application-prod.yml @@ -1,32 +1,53 @@ server: - port: 8082 -# context-path: /callcenter/api + port: 8088 ################### spring配置 ################### spring: datasource: - url: jdbc:mysql://111.198.10.15:11336/casic_metering?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&nullCatalogMeansCurrent=true + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://127.0.0.1:3001/casic_metering?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&nullCatalogMeansCurrent=true username: root - password: Casic203 - initial-size: 2 - min-idle: 1 - jms: - pub-sub-domain: true - # session: - # store-type: redis + password: Casic203xz redis: host: 127.0.0.1 port: 6379 password: - -#flowable数据源和多数据源配置 + database: 1 + serializer: org.springframework.data.redis.serializer.StringRedisSerializer + redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer +#jms: +# pub-sub-domain: true +# session: +# store-type: redis casic: - kaptcha-open: false #是否开启登录时验证码 (true/false) - nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken + #kaptcha-open: false #是否开启登录时验证码 (true/false) + no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/v2/api-docs,/v2/api-docs-ext,/doc.html,/cockpit/**,/websocket/**,/webjars/**,/swagger-ui.html,/swagger-resources,/minio/file/image/preview + #flowable数据源和多数据源配置 + db: + init: + enable: false #图片下载本地地址 file: - uploadPath: /tmp/ + uploadPath: D:\casic\tmp\ + dir: D:\casic\tmp\ + previewUrl: http://222.187.140.114:8896 + meter: + standardEquipment: #标准装置 + remindDay: 30 #到期提醒，提前天数 + delayDay: 30 #到期提醒-删除，提醒推迟天数 + template: + calibration: "现场检定审批报告" + environmental: "现场环境记录" + testOrder: "检测委托单" + testOrderExcel: "检测委托单excel" + calibrationOrder: "检定或校准委托单" + calibrationOrderExcel: "检定或校准委托单excel" + interchange: "设备交接单" + settlementTest: "检测项目结算单" + settlementCooperation: "合作机构结算单" + settlementCalibration: "校准费用结算单" logging: level.root: info level.com.casic: debug - level.org.springframework.web: info \ No newline at end of file + level.org.springframework.web: info +# level.org.flowable: debug #flowable日志，可查看SQL执行 \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java index 65fb2ca..66993a0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -144,11 +144,11 @@ * 检定结果（字典code） */ @TableField("measure_result") - @ApiModelProperty(value = "检定结果（字典code）", dataType = "String") + @ApiModelProperty(value = "检定结果（前端直接填入）", dataType = "String") private String measureResult; @TableField(exist = false) - @ApiModelProperty(value = "检定结果（字典value）", dataType = "String") + @ApiModelProperty(value = "检定结果（废弃）", dataType = "String") private String measureResultName; @TableField("environment_id") diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java index b513603..919de3a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java @@ -352,7 +352,7 @@ break; //全部 //区分管理员和普通用户 - //普通用户获取自己发起的(审批中、已通过、未通过、已取消)，管理员获取全部(审批中、已通过、未通过、已取消) + //普通用户获取自己发起的(审批中、已通过、未通过、已取消)及作为审批者的，管理员获取全部(审批中、已通过、未通过、已取消) case ApprovalStatusEnum.ALL: List AllApproveList = baseApprovalService.getAllList(request.getFormId()); if (!CollectionUtils.isEmpty(AllApproveList)) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java index c53c2d4..97660b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java @@ -18,10 +18,7 @@ import org.springframework.stereotype.Component; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; @@ -100,7 +97,7 @@ params.put("createUserName", metaData.getCreateUserName()); params.put("humidity", metaData.getHumidity()); params.put("temperature", metaData.getTemperature()); - params.put("measureResultName", metaData.getMeasureResultName()); + params.put("measureResult", metaData.getMeasureResult()); params.put("remark", metaData.getRemark()); params.put("customerName", metaData.getCustomerName()); params.put("customerAddress", metaData.getCustomerAddress()); @@ -113,6 +110,11 @@ Map map = BeanUtil.beanToMap(equipmentInfo); map.put("nameAndModel", equipmentInfo.getEquipmentName() + " " + equipmentInfo.getModelNo()); map.put("deptNameAndCertificateNo", equipmentInfo.getMesureDeptName() + " " + equipmentInfo.getCertificateNo()); + for (String key : map.keySet()) { + if (Objects.isNull(map.get(key))) { + map.put(key, "暂无"); + } + } mapList.add(map); } } diff --git a/casic-metering-api/src/main/resources/config/application-prod.yml b/casic-metering-api/src/main/resources/config/application-prod.yml index 5fe749d..b58b0d3 100644 --- a/casic-metering-api/src/main/resources/config/application-prod.yml +++ b/casic-metering-api/src/main/resources/config/application-prod.yml @@ -1,32 +1,53 @@ server: - port: 8082 -# context-path: /callcenter/api + port: 8088 ################### spring配置 ################### spring: datasource: - url: jdbc:mysql://111.198.10.15:11336/casic_metering?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&nullCatalogMeansCurrent=true + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://127.0.0.1:3001/casic_metering?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&nullCatalogMeansCurrent=true username: root - password: Casic203 - initial-size: 2 - min-idle: 1 - jms: - pub-sub-domain: true - # session: - # store-type: redis + password: Casic203xz redis: host: 127.0.0.1 port: 6379 password: - -#flowable数据源和多数据源配置 + database: 1 + serializer: org.springframework.data.redis.serializer.StringRedisSerializer + redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer +#jms: +# pub-sub-domain: true +# session: +# store-type: redis casic: - kaptcha-open: false #是否开启登录时验证码 (true/false) - nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken + #kaptcha-open: false #是否开启登录时验证码 (true/false) + no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/v2/api-docs,/v2/api-docs-ext,/doc.html,/cockpit/**,/websocket/**,/webjars/**,/swagger-ui.html,/swagger-resources,/minio/file/image/preview + #flowable数据源和多数据源配置 + db: + init: + enable: false #图片下载本地地址 file: - uploadPath: /tmp/ + uploadPath: D:\casic\tmp\ + dir: D:\casic\tmp\ + previewUrl: http://222.187.140.114:8896 + meter: + standardEquipment: #标准装置 + remindDay: 30 #到期提醒，提前天数 + delayDay: 30 #到期提醒-删除，提醒推迟天数 + template: + calibration: "现场检定审批报告" + environmental: "现场环境记录" + testOrder: "检测委托单" + testOrderExcel: "检测委托单excel" + calibrationOrder: "检定或校准委托单" + calibrationOrderExcel: "检定或校准委托单excel" + interchange: "设备交接单" + settlementTest: "检测项目结算单" + settlementCooperation: "合作机构结算单" + settlementCalibration: "校准费用结算单" logging: level.root: info level.com.casic: debug - level.org.springframework.web: info \ No newline at end of file + level.org.springframework.web: info +# level.org.flowable: debug #flowable日志，可查看SQL执行 \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java index 65fb2ca..66993a0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -144,11 +144,11 @@ * 检定结果（字典code） */ @TableField("measure_result") - @ApiModelProperty(value = "检定结果（字典code）", dataType = "String") + @ApiModelProperty(value = "检定结果（前端直接填入）", dataType = "String") private String measureResult; @TableField(exist = false) - @ApiModelProperty(value = "检定结果（字典value）", dataType = "String") + @ApiModelProperty(value = "检定结果（废弃）", dataType = "String") private String measureResultName; @TableField("environment_id") diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java index b513603..919de3a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java @@ -352,7 +352,7 @@ break; //全部 //区分管理员和普通用户 - //普通用户获取自己发起的(审批中、已通过、未通过、已取消)，管理员获取全部(审批中、已通过、未通过、已取消) + //普通用户获取自己发起的(审批中、已通过、未通过、已取消)及作为审批者的，管理员获取全部(审批中、已通过、未通过、已取消) case ApprovalStatusEnum.ALL: List AllApproveList = baseApprovalService.getAllList(request.getFormId()); if (!CollectionUtils.isEmpty(AllApproveList)) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java index c53c2d4..97660b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java @@ -18,10 +18,7 @@ import org.springframework.stereotype.Component; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; @@ -100,7 +97,7 @@ params.put("createUserName", metaData.getCreateUserName()); params.put("humidity", metaData.getHumidity()); params.put("temperature", metaData.getTemperature()); - params.put("measureResultName", metaData.getMeasureResultName()); + params.put("measureResult", metaData.getMeasureResult()); params.put("remark", metaData.getRemark()); params.put("customerName", metaData.getCustomerName()); params.put("customerAddress", metaData.getCustomerAddress()); @@ -113,6 +110,11 @@ Map map = BeanUtil.beanToMap(equipmentInfo); map.put("nameAndModel", equipmentInfo.getEquipmentName() + " " + equipmentInfo.getModelNo()); map.put("deptNameAndCertificateNo", equipmentInfo.getMesureDeptName() + " " + equipmentInfo.getCertificateNo()); + for (String key : map.keySet()) { + if (Objects.isNull(map.get(key))) { + map.put(key, "暂无"); + } + } mapList.add(map); } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/finance/SettlementPrintFileData.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/finance/SettlementPrintFileData.java index d9946e9..160460c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/finance/SettlementPrintFileData.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/finance/SettlementPrintFileData.java @@ -63,9 +63,9 @@ map.put("certificationCompany", metaData.getCertificationCompany()); map.put("certificationCompanyAddress", metaData.getCertificationCompanyAddress()); map.put("sampleCount", metaData.getSampleCount()); - map.put("shouldTestFee", metaData.getShouldTestFee()); - map.put("actualTestFee", metaData.getActualTestFee()); - map.put("actualTotalFee", metaData.getActualTotalFee()); + map.put("shouldTestFee", "¥" + metaData.getShouldTestFee()); + map.put("actualTestFee", "¥" + metaData.getActualTestFee()); + map.put("actualTotalFee", "¥" + metaData.getActualTotalFee()); DateTime dateTime = DateUtil.parseDate(metaData.getCreateTime()); SimpleDateFormat dateFormat = new SimpleDateFormat( "yyyy-MM-dd"); map.put("createTime", dateFormat.format(dateTime)); @@ -88,12 +88,12 @@ map.put("orderTime", sampleDetailsList.get(i).getOrderTime()); map.put("measureContent", sampleDetailsList.get(i).getMeasureContent()); map.put("accordStandard", sampleDetailsList.get(i).getAccordStandard()); - map.put("shouldTestFee", sampleDetailsList.get(i).getShouldTestFee()); - map.put("actualTestFee", sampleDetailsList.get(i).getActualTestFee()); - map.put("extraFee", sampleDetailsList.get(i).getExtraFee()); - map.put("repairFee", sampleDetailsList.get(i).getRepairFee()); - map.put("otherFee", sampleDetailsList.get(i).getOtherFee()); - map.put("subtotal", sampleDetailsList.get(i).getSubtotal()); + map.put("shouldTestFee", "¥" + sampleDetailsList.get(i).getShouldTestFee()); + map.put("actualTestFee", "¥" + sampleDetailsList.get(i).getActualTestFee()); + map.put("extraFee", "¥" + sampleDetailsList.get(i).getExtraFee()); + map.put("repairFee", "¥" + sampleDetailsList.get(i).getRepairFee()); + map.put("otherFee", "¥" + sampleDetailsList.get(i).getOtherFee()); + map.put("subtotal", "¥" + sampleDetailsList.get(i).getSubtotal()); map.put("remark", sampleDetailsList.get(i).getRemark()); map.put("certificationCompany", detail.getCertificationCompany()); sampleList.add(map);