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

zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/ErrorCodeConstants.java

@@ -69,6 +69,7 @@ public interface ErrorCodeConstants {
 	ErrorCode MATERIAL_ASSAY_STANDARD_FORECAST_PROJECT_NOT_EXISTS = new ErrorCode(1_032_050_000, "物料检测标准来样品位配置不存在");
 	
 	ErrorCode CONFIG_SAMPLE_HANDOVER_NOT_EXISTS = new ErrorCode(1_032_050_000, "样品交接配置不存在");
+	ErrorCode CONFIG_USER_SIGNATURE_NOT_EXISTS = new ErrorCode(1_032_050_000, "手写签名不存在");
 
 	//dictionary
 	ErrorCode DICTIONARY_SAMPLE_FLOW_NODE_NOT_EXISTS = new ErrorCode(1_032_050_000, "样品流程节点字典不存在");

zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/QmsBpmConstant.java

@@ -7,6 +7,14 @@ public class QmsBpmConstant {
      * */
     public static final String BPM_CALLBACK_BEAN_NAME = "bpmCallbackBean";
 
+    /**
+     * 流程回调时使用的ActivityId Key
+     * */
+    public static final String BPM_CALLBACK_ACTIVITY_ID = "bpmCallbackActivityId";
+
+    //驳回标记前缀
+    public static final String BPM_CALLBACK_RETURN_FLAG_PREFIX_KEY = "RETURN_FLAG_";
+
     /**
      * 流程回调时使用的beanName Key
      * */

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayReportDataPageReqVO.java

@@ -58,6 +58,9 @@ public class BusinessAssayReportDataPageReqVO extends PageParam {
 
     //==================扩展字段===========
 
+    @Schema(description = "id列表")
+    private List<Long> idList;
+
     @Schema(description = "样品名称")
     private String sampleName;
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigUserSignaturePageReqVO.java

@@ -0,0 +1,40 @@
+package com.zt.plat.module.qms.business.config.controller.vo;
+
+import lombok.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import com.zt.plat.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 手写签名配置分页 Request VO")
+@Data
+public class ConfigUserSignaturePageReqVO extends PageParam {
+
+    @Schema(description = "用户id", example = "2926")
+    private String userId;
+
+    @Schema(description = "用户姓名", example = "赵六")
+    private String userName;
+
+    @Schema(description = "文件id", example = "9170")
+    private Long fileId;
+
+    @Schema(description = "签名内容")
+    private String signatureContent;
+
+    @Schema(description = "禁用标识")
+    private Integer cancelFlag;
+
+    @Schema(description = "所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "备注")
+    private String remark;
+
+}

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigUserSignatureRespVO.java

@@ -0,0 +1,50 @@
+package com.zt.plat.module.qms.business.config.controller.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+
+@Schema(description = "管理后台 - 手写签名配置 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class ConfigUserSignatureRespVO {
+
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "17765")
+    @ExcelProperty("ID")
+    private Long id;
+
+    @Schema(description = "用户id", example = "2926")
+    @ExcelProperty("用户id")
+    private String userId;
+
+    @Schema(description = "用户姓名", example = "赵六")
+    @ExcelProperty("用户姓名")
+    private String userName;
+
+    @Schema(description = "文件id", example = "9170")
+    @ExcelProperty("文件id")
+    private Long fileId;
+
+    @Schema(description = "签名内容")
+    @ExcelProperty("签名内容")
+    private String signatureContent;
+
+    @Schema(description = "禁用标识")
+    @ExcelProperty("禁用标识")
+    private Integer cancelFlag;
+
+    @Schema(description = "所属部门")
+    @ExcelProperty("所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "备注")
+    @ExcelProperty("备注")
+    private String remark;
+
+}

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigUserSignatureSaveReqVO.java

@@ -0,0 +1,34 @@
+package com.zt.plat.module.qms.business.config.controller.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+@Schema(description = "管理后台 - 手写签名配置新增/修改 Request VO")
+@Data
+public class ConfigUserSignatureSaveReqVO {
+
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "17765")
+    private Long id;
+
+    @Schema(description = "用户id", example = "2926")
+    private String userId;
+
+    @Schema(description = "用户姓名", example = "赵六")
+    private String userName;
+
+    @Schema(description = "文件id", example = "9170")
+    private Long fileId;
+
+    @Schema(description = "签名内容")
+    private String signatureContent;
+
+    @Schema(description = "禁用标识")
+    private Integer cancelFlag;
+
+    @Schema(description = "所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "备注")
+    private String remark;
+
+}

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/dataobject/ConfigUserSignatureDO.java

@@ -0,0 +1,67 @@
+package com.zt.plat.module.qms.business.config.dal.dataobject;
+
+import lombok.*;
+import com.baomidou.mybatisplus.annotation.*;
+import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
+/**
+* 手写签名配置 DO
+*
+* @author 后台管理
+*/
+@TableName("t_cfg_user_sig")
+@KeySequence("t_cfg_user_sig_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+/**
+* 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO
+*/
+public class ConfigUserSignatureDO extends BusinessBaseDO {
+
+
+
+    /**
+    * ID
+    */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+    /**
+    * 用户id
+    */
+    @TableField("USER_ID")
+    private String userId;
+    /**
+    * 用户姓名
+    */
+    @TableField("USER_NAME")
+    private String userName;
+    /**
+    * 文件id
+    */
+    @TableField("FILE_ID")
+    private Long fileId;
+    /**
+    * 签名内容
+    */
+    @TableField("SIG_CNTT")
+    private String signatureContent;
+    /**
+    * 禁用标识
+    */
+    @TableField("CNL_FLG")
+    private Integer cancelFlag;
+    /**
+    * 所属部门
+    */
+    @TableField("SYS_DEPT_CD")
+    private String systemDepartmentCode;
+    /**
+    * 备注
+    */
+    @TableField("RMK")
+    private String remark;
+
+}

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/mapper/ConfigUserSignatureMapper.java

@@ -0,0 +1,31 @@
+package com.zt.plat.module.qms.business.config.dal.mapper;
+
+import com.zt.plat.framework.common.pojo.PageResult;
+import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
+import com.zt.plat.module.qms.business.config.controller.vo.ConfigUserSignaturePageReqVO;
+import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigUserSignatureDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 手写签名配置 Mapper
+ *
+ * @author 后台管理
+ */
+@Mapper
+public interface ConfigUserSignatureMapper extends BaseMapperX<ConfigUserSignatureDO> {
+
+    default PageResult<ConfigUserSignatureDO> selectPage(ConfigUserSignaturePageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<ConfigUserSignatureDO>()
+                .eqIfPresent(ConfigUserSignatureDO::getUserId, reqVO.getUserId())
+                .likeIfPresent(ConfigUserSignatureDO::getUserName, reqVO.getUserName())
+                .eqIfPresent(ConfigUserSignatureDO::getFileId, reqVO.getFileId())
+                .eqIfPresent(ConfigUserSignatureDO::getSignatureContent, reqVO.getSignatureContent())
+                .eqIfPresent(ConfigUserSignatureDO::getCancelFlag, reqVO.getCancelFlag())
+                .eqIfPresent(ConfigUserSignatureDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
+                .betweenIfPresent(ConfigUserSignatureDO::getCreateTime, reqVO.getCreateTime())
+                .eqIfPresent(ConfigUserSignatureDO::getRemark, reqVO.getRemark())
+                .orderByDesc(ConfigUserSignatureDO::getId));
+    }
+
+}

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/service/ConfigUserSignatureService.java

@@ -0,0 +1,66 @@
+package com.zt.plat.module.qms.business.config.service;
+
+import java.util.*;
+
+import com.zt.plat.module.qms.business.config.controller.vo.ConfigUserSignaturePageReqVO;
+import com.zt.plat.module.qms.business.config.controller.vo.ConfigUserSignatureRespVO;
+import com.zt.plat.module.qms.business.config.controller.vo.ConfigUserSignatureSaveReqVO;
+import jakarta.validation.*;
+import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigUserSignatureDO;
+import com.zt.plat.framework.common.pojo.PageResult;
+
+/**
+ * 手写签名配置 Service 接口
+ *
+ * @author 后台管理
+ */
+public interface ConfigUserSignatureService {
+
+    ConfigUserSignatureDO getByUserId(Long userId);
+
+    /**
+     * 创建手写签名配置
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    ConfigUserSignatureRespVO createConfigUserSignature(@Valid ConfigUserSignatureSaveReqVO createReqVO);
+
+    /**
+     * 更新手写签名配置
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateConfigUserSignature(@Valid ConfigUserSignatureSaveReqVO updateReqVO);
+
+    /**
+     * 删除手写签名配置
+     *
+     * @param id 编号
+     */
+    void deleteConfigUserSignature(Long id);
+
+    /**
+    * 批量删除手写签名配置
+    *
+    * @param ids 编号
+    */
+    void deleteConfigUserSignatureListByIds(List<Long> ids);
+
+    /**
+     * 获得手写签名配置
+     *
+     * @param id 编号
+     * @return 手写签名配置
+     */
+    ConfigUserSignatureDO getConfigUserSignature(Long id);
+
+    /**
+     * 获得手写签名配置分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 手写签名配置分页
+     */
+    PageResult<ConfigUserSignatureDO> getConfigUserSignaturePage(ConfigUserSignaturePageReqVO pageReqVO);
+
+}