Merge remote-tracking branch 'origin/test' into test

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/service/DataOpinionService.java

@@ -23,6 +23,10 @@ public interface DataOpinionService {
 
     void saveOpinionByWfCallback(DeviceApplyDO entity, String activityId, String activityName, JSONObject taskVariables);
 
+    List<DataOpinionDO> getListByBusId(Long busId);
+
+    List<DataOpinionDO> getListByFlowInsId(String flowInsId);
+
     /**
      * 创建审批意见
      *

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/service/DataOpinionServiceImpl.java

@@ -2,6 +2,7 @@ package com.zt.plat.module.qms.common.data.service;
 
 import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.zt.plat.framework.security.core.LoginUser;
 import com.zt.plat.framework.security.core.util.SecurityFrameworkUtils;
@@ -86,6 +87,23 @@ public class DataOpinionServiceImpl implements DataOpinionService {
         dataOpinionMapper.insert(opinion);
     }
 
+    @Override
+    public List<DataOpinionDO> getListByBusId(Long busId) {
+        LambdaQueryWrapper<DataOpinionDO> query = new LambdaQueryWrapper<>();
+        query.eq(DataOpinionDO::getBusinessId, busId);
+        query.eq(DataOpinionDO::getCancelFlag, "0");
+        return dataOpinionMapper.selectList(query);
+    }
+
+
+    @Override
+    public List<DataOpinionDO> getListByFlowInsId(String flowInsId) {
+        LambdaQueryWrapper<DataOpinionDO> query = new LambdaQueryWrapper<>();
+        query.eq(DataOpinionDO::getFlowInstanceId, flowInsId);
+        query.eq(DataOpinionDO::getCancelFlag, "0");
+        return dataOpinionMapper.selectList(query);
+    }
+
     @Override
     public DataOpinionRespVO createDataOpinion(DataOpinionSaveReqVO createReqVO) {
         // 插入

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceApplyController.java

@@ -120,6 +120,13 @@ public class DeviceApplyController extends AbstractFileUploadController implemen
         return success(BeanUtils.toBean(deviceApply, DeviceApplyRespVO.class));
     }
 
+    @GetMapping("/getWithOpinions")
+    @Operation(summary = "获得设备通用流程详情，含意见内容")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    public CommonResult<JSONObject> getWithOpinions(@RequestParam("id") Long id) {
+        return deviceApplyService.getWithOpinions(id);
+    }
+
     @GetMapping("/page")
     @Operation(summary = "获得设备通用流程,验收、降级、停用、报废、还原、启用分页")
     public CommonResult<PageResult<DeviceApplyRespVO>> getDeviceApplyPage(@Valid DeviceApplyPageReqVO pageReqVO) {

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceApplyDetailRespVO.java

@@ -2,6 +2,8 @@ package com.zt.plat.module.qms.resource.device.controller.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
+
+import java.math.BigDecimal;
 import java.util.*;
 import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
@@ -82,4 +84,12 @@ public class DeviceApplyDetailRespVO {
     @Schema(description = "存放位置")
     @ExcelProperty("存放位置")
     private String position;
+
+    @Schema(description = "采购时间")
+    @ExcelProperty("采购时间")
+    private LocalDateTime purchaseDate;
+
+    @Schema(description = "购入价格", example = "25826")
+    @ExcelProperty("购入价格")
+    private BigDecimal purchasePrice;
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceApplyPageReqVO.java

@@ -27,6 +27,9 @@ public class DeviceApplyPageReqVO extends PageParam {
     @Schema(description = "申请人ID")
     private String applyUser;
 
+    @Schema(description = "申请标题")
+    private String title;
+
     @Schema(description = "业务编码")
     private String businessCode;
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceApplyRespVO.java

@@ -32,6 +32,10 @@ public class DeviceApplyRespVO {
     @ExcelProperty("申请人")
     private String applyUserName;
 
+    @Schema(description = "申请标题")
+    @ExcelProperty("申请标题")
+    private String title;
+
     @Schema(description = "申请人ID")
     @ExcelProperty("申请人ID")
     private String applyUser;

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceApplySaveReqVO.java

@@ -1,5 +1,6 @@
 package com.zt.plat.module.qms.resource.device.controller.vo;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
@@ -27,6 +28,9 @@ public class DeviceApplySaveReqVO {
     @Schema(description = "申请人ID")
     private String applyUser;
 
+    @Schema(description = "申请标题")
+    private String title;
+
     @Schema(description = "业务编码")
     private String businessCode;
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/dataobject/DeviceApplyDO.java

@@ -56,6 +56,10 @@ public class DeviceApplyDO extends BusinessBaseDO {
      */
     @TableField("APL_USER")
     private Long applyUser;
+
+    @TableField("TTL")
+    private String title;
+
     /**
      * 业务编码
      */

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceApplyDetailMapper.java

@@ -47,6 +47,8 @@ public interface DeviceApplyDetailMapper extends BaseMapperX<DeviceApplyDetailDO
                 .selectAs(DeviceInfomationDO::getDeviceCode, DeviceApplyDetailRespVO::getDeviceCode)
                 .selectAs(DeviceInfomationDO::getFactoryCode, DeviceApplyDetailRespVO::getFactoryCode)
                 .selectAs(DeviceInfomationDO::getPosition, DeviceApplyDetailRespVO::getPosition)
+                .selectAs(DeviceInfomationDO::getPurchaseDate, DeviceApplyDetailRespVO::getPurchaseDate)
+                .selectAs(DeviceInfomationDO::getPurchasePrice, DeviceApplyDetailRespVO::getPurchasePrice)
                 .eqIfPresent(DeviceApplyDetailDO::getApplyId, reqVO.getApplyId())
                 .eqIfPresent(DeviceApplyDetailDO::getDeviceInfomationId, reqVO.getDeviceInfomationId())
                 .inIfPresent(DeviceApplyDetailDO::getDeviceInfomationId, reqVO.getDeviceInfoIdList())
@@ -86,6 +88,8 @@ public interface DeviceApplyDetailMapper extends BaseMapperX<DeviceApplyDetailDO
                 .selectAs(DeviceInfomationDO::getDeviceCode, DeviceApplyDetailRespVO::getDeviceCode)
                 .selectAs(DeviceInfomationDO::getFactoryCode, DeviceApplyDetailRespVO::getFactoryCode)
                 .selectAs(DeviceInfomationDO::getPosition, DeviceApplyDetailRespVO::getPosition)
+                .selectAs(DeviceInfomationDO::getPurchaseDate, DeviceApplyDetailRespVO::getPurchaseDate)
+                .selectAs(DeviceInfomationDO::getPurchasePrice, DeviceApplyDetailRespVO::getPurchasePrice)
                 .eqIfPresent(DeviceApplyDetailDO::getApplyId, reqVO.getApplyId())
                 .eqIfPresent(DeviceApplyDetailDO::getDeviceInfomationId, reqVO.getDeviceInfomationId())
                 .inIfPresent(DeviceApplyDetailDO::getDeviceInfomationId, reqVO.getDeviceInfoIdList())

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceApplyMapper.java

@@ -29,6 +29,7 @@ public interface DeviceApplyMapper extends BaseMapperX<DeviceApplyDO> {
                 .eqIfPresent(DeviceApplyDO::getApplyDepartment, reqVO.getApplyDepartment())
                 .likeIfPresent(DeviceApplyDO::getApplyUserName, reqVO.getApplyUserName())
                 .eqIfPresent(DeviceApplyDO::getApplyUser, reqVO.getApplyUser())
+                .likeIfPresent(DeviceApplyDO::getTitle, reqVO.getTitle())
                 .eqIfPresent(DeviceApplyDO::getBusinessCode, reqVO.getBusinessCode())
                 .betweenIfPresent(DeviceApplyDO::getBusinessDate, reqVO.getBusinessDate())
                 .eqIfPresent(DeviceApplyDO::getBusinessReason, reqVO.getBusinessReason())