lims-ruoyi-after.git

zhuo

2025-04-16 0d0f9bf9cc37073d23889c4d8aa8bb5bd038c85f

耐丝配置文件修改

已修改4个文件

已重命名1个文件

	cnas-process/src/main/java/com/ruoyi/process/pojo/QualityMonitorDetails.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/java/com/ruoyi/process/service/impl/QualityMonitorServiceImpl.java	15 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cnas-process/src/main/resources/mapper/QualityMonitorDetailsMapper.xml	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-admin/src/main/resources/application-ztns.yml	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 cnas-process/src/main/java/com/ruoyi/process/pojo/QualityMonitorDetails.java

@@ -49,6 +49,11 @@
    @ApiModelProperty("å®ææ¥åå°å")
    private String finishReportUrl;

    @ApiModelProperty("å®ææ¥åç¼åæ¶é´")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime writeTime;


    @ApiModelProperty("å®ææ¥åæ¹åäºº")
    private Integer ratifyUserId;


 cnas-process/src/main/java/com/ruoyi/process/service/impl/QualityMonitorServiceImpl.java

@@ -710,7 +710,7 @@
        BeanUtils.copyProperties(qualityMonitorDetailsEvaluate, qualityMonitorDetailsEvaluateDto);
        // æ ¼å¼åæ¶é´
        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
        qualityMonitorDetailsEvaluateDto.setRatifyTimeStr(qualityMonitorDetailsEvaluate.getRatifyTime().format(dateTimeFormatter));
        qualityMonitorDetailsEvaluateDto.setRatifyTimeStr(qualityMonitorDetailsEvaluate.getRatifyTime() == null ? null : qualityMonitorDetailsEvaluate.getRatifyTime().format(dateTimeFormatter));
        // è·åè·¯å¾
        InputStream inputStream = this.getClass().getResourceAsStream("/static/quality-monitor-evaluate.docx");
        Configure configure = Configure.builder()
@@ -751,7 +751,9 @@
        if (qualityMonitorDetailsId == null) {
            throw new ErrorException("ç¼ºå°çæ§è¯¦æid");
        }

        QualityMonitorDetails qualityMonitorDetails = qualityMonitorDetailsService.getOne(Wrappers.<QualityMonitorDetails>lambdaUpdate()
                .eq(QualityMonitorDetails::getQualityMonitorDetailsId, qualityMonitorDetailsId));
        LocalDateTime now = LocalDateTime.now();
        Integer userId =SecurityUtils.getUserId().intValue();

        String urlString;
@@ -768,10 +770,13 @@

            wordInsertUrl(new HashMap<String, Object>() {{
                put("writeUrl", UserUtils.getFinalUserSignatureUrl(userId));
                put("writeDateUrl", Pictures.ofStream(DateImageUtil.createDateImage(now)).create());
            }}, wordUrl + "/" + pathName.replace("/word", wordUrl));

            qualityMonitorDetailsService.update(Wrappers.<QualityMonitorDetails>lambdaUpdate()
                    .eq(QualityMonitorDetails::getQualityMonitorDetailsId, qualityMonitorDetailsId)
                    .set(QualityMonitorDetails::getFinishReportUrl, pathName));
                    .set(QualityMonitorDetails::getFinishReportUrl, pathName)
                    .set(QualityMonitorDetails::getWriteTime, now));

            return true;
        } catch (Exception e) {
@@ -787,13 +792,14 @@
     */
    @Override
    public boolean ratifyFinishReport(QualityMonitorDetails qualityMonitorDetails) {
        LocalDateTime now = LocalDateTime.now();
        Integer userId =SecurityUtils.getUserId().intValue();
        LambdaUpdateWrapper<QualityMonitorDetails> wrapper = Wrappers.<QualityMonitorDetails>lambdaUpdate()
                .eq(QualityMonitorDetails::getQualityMonitorDetailsId, qualityMonitorDetails.getQualityMonitorDetailsId())
                .set(QualityMonitorDetails::getRatifyUserId, userId)
                .set(QualityMonitorDetails::getRatifyRemark, qualityMonitorDetails.getRatifyRemark())
                .set(QualityMonitorDetails::getRatifyStatus, qualityMonitorDetails.getRatifyStatus())
                .set(QualityMonitorDetails::getRatifyTime, LocalDateTime.now());
                .set(QualityMonitorDetails::getRatifyTime, now);
        if (qualityMonitorDetails.getRatifyStatus().equals(0)) {
            wrapper.set(QualityMonitorDetails::getFinishReportUrl, null);
        }
@@ -804,6 +810,7 @@
        if (StringUtils.isNotBlank(details.getFinishReportUrl())) {
            wordInsertUrl(new HashMap<String, Object>() {{
                put("ratifyUrl", UserUtils.getFinalUserSignatureUrl(userId));
                put("ratifyDateUrl", Pictures.ofStream(DateImageUtil.createDateImage(now)).create());
            }}, wordUrl + "/" + details.getFinishReportUrl().replace("/word", wordUrl));
        }
        return true;

 cnas-process/src/main/resources/mapper/QualityMonitorDetailsMapper.xml

@@ -29,5 +29,12 @@
        <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
            ${ew.customSqlSegment}
        </if>
        order by quality_monitor_id, monitor_purpose, -- æåå¹´ä»½
        CAST(SUBSTRING(planned_time, 1, 4) AS SIGNED) ASC,
        -- æåæä»½
        CASE
        WHEN planned_time LIKE '% - %' THEN 1
        ELSE CAST(SUBSTRING_INDEX(SUBSTRING(planned_time, 6), 'æ', 1) AS SIGNED)
        END ASC
    </select>
</mapper>

 inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java

@@ -499,13 +499,15 @@
                    }
                }

                //æ¥è¯¢æ£éªåä¿¡æ¯
                // æ·»å å·¥æ¶
                InsProduct finalInsProduct = insProductMapper.selectById(product.getId());
                threadPoolTaskExecutor.execute(() -> {
                    InsOrder insOrder = insOrderMapper.selectById(insSample.getInsOrderId());
                    this.addAuxiliary(userId, finalInsProduct, insOrder);
                });
                // å¤ææ¯å¦åªæ¯åä¸è®¡ç®å¼, åä¸è®¡ç®å¼å®éæ²¡æå¡«å
                if (StringUtils.isNotBlank(newResult.getInsValue()) && !newResult.getInsValue().equals("[]")) {
                    InsProduct finalInsProduct = insProductMapper.selectById(product.getId());
                    threadPoolTaskExecutor.execute(() -> {
                        InsOrder insOrder = insOrderMapper.selectById(insSample.getInsOrderId());
                        this.addAuxiliary(userId, finalInsProduct, insOrder);
                    });
                }

            }
        });

 ruoyi-admin/src/main/resources/application-ztns.yml

ÎÄ¼þÃû´Ó ruoyi-admin/src/main/resources/application-ztzb.yml ÐÞ¸Ä
@@ -130,14 +130,14 @@

# oaæµç¨
oa:
  oaHost: http://192.168.0.49:8000/oa_workflowrequest.asmx?wsdl
  prodIp: http://192.168.21.53:8001/lims
  unqualifiedProcessId: 41974
  oaHost:
  prodIp:
  unqualifiedProcessId:

# ä¼ä¸å¾®ä¿¡æ¨é
wechat:
  # è´¨éæ¥æ£éç¥
  examiningUrl: https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=6e1d2d18-0c60-4889-a05f-b1b5479c9188
  examiningUrl:

# äººäºç³»ç»
personnel:
@@ -172,4 +172,4 @@
  completion-timeout: 3000 # è¿æ¥è¶æ¶æ¶é´ï¼åä½ï¼ç§ï¼
  clientId: javaPublish # clientId
  subscribe: /ztt/v3/2443521/publish # è®¢éä¸»é¢
  client: true # å¦æå¼åéè¦å¯å¨æµè¯ï¼éè¦æ¹ä¸ºfalseä¸ç¶ä¼ä¸ç´æ¥é
  client: false # å¦æå¼åéè¦å¯å¨æµè¯ï¼éè¦æ¹ä¸ºfalseä¸ç¶ä¼ä¸ç´æ¥é

			@@ -49,6 +49,11 @@
			@ApiModelProperty("å®ææ¥åå°å")
			private String finishReportUrl;

			@ApiModelProperty("å®ææ¥åç¼åæ¶é´")
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
			private LocalDateTime writeTime;


			@ApiModelProperty("å®ææ¥åæ¹åäºº")
			private Integer ratifyUserId;

			@@ -710,7 +710,7 @@
			BeanUtils.copyProperties(qualityMonitorDetailsEvaluate, qualityMonitorDetailsEvaluateDto);
			// æ ¼å¼åæ¶é´
			DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
			qualityMonitorDetailsEvaluateDto.setRatifyTimeStr(qualityMonitorDetailsEvaluate.getRatifyTime().format(dateTimeFormatter));
			qualityMonitorDetailsEvaluateDto.setRatifyTimeStr(qualityMonitorDetailsEvaluate.getRatifyTime() == null ? null : qualityMonitorDetailsEvaluate.getRatifyTime().format(dateTimeFormatter));
			// è·åè·¯å¾
			InputStream inputStream = this.getClass().getResourceAsStream("/static/quality-monitor-evaluate.docx");
			Configure configure = Configure.builder()
			@@ -751,7 +751,9 @@
			if (qualityMonitorDetailsId == null) {
			throw new ErrorException("ç¼ºå°çæ§è¯¦æid");
			}

			QualityMonitorDetails qualityMonitorDetails = qualityMonitorDetailsService.getOne(Wrappers.<QualityMonitorDetails>lambdaUpdate()
			.eq(QualityMonitorDetails::getQualityMonitorDetailsId, qualityMonitorDetailsId));
			LocalDateTime now = LocalDateTime.now();
			Integer userId =SecurityUtils.getUserId().intValue();

			String urlString;
			@@ -768,10 +770,13 @@

			wordInsertUrl(new HashMap<String, Object>() {{
			put("writeUrl", UserUtils.getFinalUserSignatureUrl(userId));
			put("writeDateUrl", Pictures.ofStream(DateImageUtil.createDateImage(now)).create());
			}}, wordUrl + "/" + pathName.replace("/word", wordUrl));

			qualityMonitorDetailsService.update(Wrappers.<QualityMonitorDetails>lambdaUpdate()
			.eq(QualityMonitorDetails::getQualityMonitorDetailsId, qualityMonitorDetailsId)
			.set(QualityMonitorDetails::getFinishReportUrl, pathName));
			.set(QualityMonitorDetails::getFinishReportUrl, pathName)
			.set(QualityMonitorDetails::getWriteTime, now));

			return true;
			} catch (Exception e) {
			@@ -787,13 +792,14 @@
			*/
			@Override
			public boolean ratifyFinishReport(QualityMonitorDetails qualityMonitorDetails) {
			LocalDateTime now = LocalDateTime.now();
			Integer userId =SecurityUtils.getUserId().intValue();
			LambdaUpdateWrapper<QualityMonitorDetails> wrapper = Wrappers.<QualityMonitorDetails>lambdaUpdate()
			.eq(QualityMonitorDetails::getQualityMonitorDetailsId, qualityMonitorDetails.getQualityMonitorDetailsId())
			.set(QualityMonitorDetails::getRatifyUserId, userId)
			.set(QualityMonitorDetails::getRatifyRemark, qualityMonitorDetails.getRatifyRemark())
			.set(QualityMonitorDetails::getRatifyStatus, qualityMonitorDetails.getRatifyStatus())
			.set(QualityMonitorDetails::getRatifyTime, LocalDateTime.now());
			.set(QualityMonitorDetails::getRatifyTime, now);
			if (qualityMonitorDetails.getRatifyStatus().equals(0)) {
			wrapper.set(QualityMonitorDetails::getFinishReportUrl, null);
			}
			@@ -804,6 +810,7 @@
			if (StringUtils.isNotBlank(details.getFinishReportUrl())) {
			wordInsertUrl(new HashMap<String, Object>() {{
			put("ratifyUrl", UserUtils.getFinalUserSignatureUrl(userId));
			put("ratifyDateUrl", Pictures.ofStream(DateImageUtil.createDateImage(now)).create());
			}}, wordUrl + "/" + details.getFinishReportUrl().replace("/word", wordUrl));
			}
			return true;

			@@ -29,5 +29,12 @@
			<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
			${ew.customSqlSegment}
			</if>
			order by quality_monitor_id, monitor_purpose, -- æåå¹´ä»½
			CAST(SUBSTRING(planned_time, 1, 4) AS SIGNED) ASC,
			-- æåæä»½
			CASE
			WHEN planned_time LIKE '% - %' THEN 1
			ELSE CAST(SUBSTRING_INDEX(SUBSTRING(planned_time, 6), 'æ', 1) AS SIGNED)
			END ASC
			</select>
			</mapper>

			@@ -499,13 +499,15 @@
			}
			}

			//æ¥è¯¢æ£éªåä¿¡æ¯
			// æ·»å å·¥æ¶
			InsProduct finalInsProduct = insProductMapper.selectById(product.getId());
			threadPoolTaskExecutor.execute(() -> {
			InsOrder insOrder = insOrderMapper.selectById(insSample.getInsOrderId());
			this.addAuxiliary(userId, finalInsProduct, insOrder);
			});
			// å¤ææ¯å¦åªæ¯åä¸è®¡ç®å¼, åä¸è®¡ç®å¼å®éæ²¡æå¡«å
			if (StringUtils.isNotBlank(newResult.getInsValue()) && !newResult.getInsValue().equals("[]")) {
			InsProduct finalInsProduct = insProductMapper.selectById(product.getId());
			threadPoolTaskExecutor.execute(() -> {
			InsOrder insOrder = insOrderMapper.selectById(insSample.getInsOrderId());
			this.addAuxiliary(userId, finalInsProduct, insOrder);
			});
			}

			}
			});

ÎÄ¼þÃû´Ó ruoyi-admin/src/main/resources/application-ztzb.yml ÐÞ¸Ä
			@@ -130,14 +130,14 @@

			# oaæµç¨
			oa:
			oaHost: http://192.168.0.49:8000/oa_workflowrequest.asmx?wsdl
			prodIp: http://192.168.21.53:8001/lims
			unqualifiedProcessId: 41974
			oaHost:
			prodIp:
			unqualifiedProcessId:

			# ä¼ä¸å¾®ä¿¡æ¨é
			wechat:
			# è´¨éæ¥æ£éç¥
			examiningUrl: https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=6e1d2d18-0c60-4889-a05f-b1b5479c9188
			examiningUrl:

			# äººäºç³»ç»
			personnel:
			@@ -172,4 +172,4 @@
			completion-timeout: 3000 # è¿æ¥è¶æ¶æ¶é´ï¼åä½ï¼ç§ï¼
			clientId: javaPublish # clientId
			subscribe: /ztt/v3/2443521/publish # è®¢éä¸»é¢
			client: true # å¦æå¼åéè¦å¯å¨æµè¯ï¼éè¦æ¹ä¸ºfalseä¸ç¶ä¼ä¸ç´æ¥é
			client: false # å¦æå¼åéè¦å¯å¨æµè¯ï¼éè¦æ¹ä¸ºfalseä¸ç¶ä¼ä¸ç´æ¥é