修改名称

hx-common/common-client-util/pom.xml

@@ -25,7 +25,7 @@
 
         <dependency>
             <groupId>com.fjhx</groupId>
-            <artifactId>common-file-api</artifactId>
+            <artifactId>service-file-api</artifactId>
         </dependency>
 
     </dependencies>

hx-common/common-tool/src/main/java/com/fjhx/utils/CodeUtil.java

@@ -1,24 +0,0 @@
-package com.fjhx.utils;
-
-import java.text.DecimalFormat;
-
-/**
- * 编码生成工具类
- * @Author:caozj
- * @DATE:2022/7/13 11:17
- */
-public class CodeUtil {
-
-    /**
-     * 生成供应商编码
-     * @param code
-     * @return
-     */
-    public static String generateWmsCode(String code){
-        DecimalFormat decimalFormat=new DecimalFormat("0000");
-        String codenew=code.substring(1);
-        int i=Integer.parseInt(codenew)+1;
-        String k=decimalFormat.format(i);
-        return "C"+k;
-    }
-}

hx-common/library-product/src/main/java/com/fjhx/mapper/MaterialMapper.xml

@@ -8,4 +8,5 @@
         where m.del_flag = 0
           and m.tenant_id = #{tenantId}
     </select>
+
 </mapper>

hx-common/library-product/src/main/java/com/fjhx/service/impl/MaterialServiceImpl.java

@@ -29,32 +29,8 @@ import java.util.List;
 @RequiredArgsConstructor
 public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, Material> implements MaterialService {
 
-//    private final ClassifyService classifyService;
-
     private final RedisLockClient redisLockClient;
 
-//    @Override
-//    public Page<Material> getPage(Map<String, String> condition) {
-//
-//        QueryWrapper<Material> wrapper = Wrappers.query();
-//
-//        WrapperUtil.init(condition, wrapper)
-//                .keyword("code", "name")
-//                .eqTenantId();
-//
-//        // 编码正序
-//        wrapper.orderByAsc("code");
-//
-//        // 如果传入分类id，查询分类已经分类下级
-//        String classifyId = condition.get("classifyId");
-//        if (ObjectUtil.isNotEmpty(classifyId)) {
-//            List<Long> childrenIdList = classifyService.getChildrenIdList(Long.valueOf(classifyId));
-//            wrapper.in("classify_id", childrenIdList);
-//        }
-//
-//        return page(condition, wrapper);
-//    }
-
     @Override
     public void add(MaterialVo materialVo) {
         Assert.notEmpty(materialVo.getName(), "物料名称不能为空");

hx-common/library-product/src/main/java/com/fjhx/service/impl/ProductServiceImpl.java

@@ -16,7 +16,6 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -30,29 +29,8 @@ import java.util.Map;
 @RequiredArgsConstructor
 public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> implements ProductService {
 
-//    private final ClassifyService classifyService;
-
     private final RedisLockClient redisLockClient;
 
-//    @Override
-//    public Page<Product> getPage(Map<String, String> condition) {
-//
-//        QueryWrapper<Product> wrapper = Wrappers.query();
-//
-//        WrapperUtil.init(condition, wrapper)
-//                .keyword("code", "name")
-//                .eqTenantId();
-//
-//        // 如果传入分类id，查询分类已经分类下级
-//        Object classifyId = condition.get("classifyId");
-//        if (ObjectUtil.isNotEmpty(classifyId)) {
-//            List<Long> childrenIdList = classifyService.getChildrenIdList(Long.valueOf(classifyId.toString()));
-//            wrapper.in("classify_id", childrenIdList);
-//        }
-//
-//        return page(condition, wrapper);
-//    }
-
     @Override
     public void add(ProductVo productVo) {
         Assert.notEmpty(productVo.getName(), "产品名称不能为空");

hx-common/pom.xml

@@ -15,12 +15,12 @@
     <modules>
         <module>code-generator</module>
         <module>common-client-util</module>
-        <module>common-file</module>
+        <module>service-file</module>
         <module>common-flow</module>
         <module>common-rocketmq</module>
         <module>common-socket</module>
         <module>common-tool</module>
-        <module>common-video</module>
+        <module>service-video</module>
         <module>library-product</module>
     </modules>
 
@@ -92,7 +92,7 @@
 
             <dependency>
                 <groupId>com.fjhx</groupId>
-                <artifactId>common-file-api</artifactId>
+                <artifactId>service-file-api</artifactId>
                 <version>${hx.version}</version>
             </dependency>
 
@@ -116,7 +116,7 @@
 
             <dependency>
                 <groupId>com.fjhx</groupId>
-                <artifactId>common-video-api</artifactId>
+                <artifactId>service-video-api</artifactId>
                 <version>${hx.version}</version>
             </dependency>
 

hx-common/common-file/pom.xml → hx-common/service-file/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>common-file</artifactId>
+    <artifactId>service-file</artifactId>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
@@ -20,7 +20,7 @@
 
         <dependency>
             <groupId>com.fjhx</groupId>
-            <artifactId>common-file-api</artifactId>
+            <artifactId>service-file-api</artifactId>
         </dependency>
 
 

hx-common/common-video/pom.xml → hx-common/service-video/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>common-video</artifactId>
+    <artifactId>service-video</artifactId>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
@@ -35,7 +35,7 @@
 
         <dependency>
             <groupId>com.fjhx</groupId>
-            <artifactId>common-video-api</artifactId>
+            <artifactId>service-video-api</artifactId>
         </dependency>
 
     </dependencies>

hx-service-api/common-flow-api/src/main/java/com/fjhx/myapp/application/entity/Flow.java

@@ -1,10 +1,15 @@
 package com.fjhx.myapp.application.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.fjhx.base.BasicEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * 业务附件表实体类
  *
@@ -13,11 +18,29 @@ import lombok.Data;
  */
 @Data
 @TableName("act_flow")
-public class Flow extends BasicEntity {
+public class Flow implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
     /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    /**
+     * 创建时间
+     */
+    @TableField("CreatedTime")
+    private Date CreatedTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("UpdatedTime")
+    private Date UpdatedTime;
+
+    /**
      * 流程名称
      */
     @ApiModelProperty(value = "流程名称")

hx-service-api/common-flow-api/src/main/java/com/fjhx/myapp/application/entity/FlowApplycheck.java

@@ -16,19 +16,16 @@
  */
 package com.fjhx.myapp.application.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
 
-import com.fjhx.base.BasicEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
 /**
  * 流程审批实体类
  *
@@ -37,82 +34,100 @@ import io.swagger.annotations.ApiModelProperty;
  */
 @Data
 @TableName("act_flow_applycheck")
-public class FlowApplycheck extends BasicEntity {
+public class FlowApplycheck implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    /**
+     * 创建时间
+     */
+    @TableField("CreatedTime")
+    private Date CreatedTime;
 
-	private static final long serialVersionUID = 1L;
+    /**
+     * 更新时间
+     */
+    @TableField("UpdatedTime")
+    private Date UpdatedTime;
 
-	/**
-	* 软删除
-	*/
-	@ApiModelProperty(value = "软删除")
-	private Boolean isDelete;
+    /**
+     * 软删除
+     */
+    @ApiModelProperty(value = "软删除")
+    private Boolean isDelete;
 
-	/**
-	* 流程编号
-	*/
-	@ApiModelProperty(value = "流程编号")
-	private String flowId;
-	/**
-	* 当前节点
-	*/
-	@ApiModelProperty(value = "当前节点")
-	private String nodeId;
-	/**
-	* 上个节点
-	*/
-	@ApiModelProperty(value = "上个节点")
-	private String preNodeId;
-	/**
-	* 下个节点
-	*/
-	@ApiModelProperty(value = "下个节点")
-	private String nextNodeId;
-	/**
-	* 审批人
-	*/
-	@ApiModelProperty(value = "审批人")
-	private String checkUserId;
-	/**
-	* 审批结果 （枚举定义：0=已发起，1=待审批，2=审批通过，3=审批驳回，4=已撤回）
-	*/
-	@ApiModelProperty(value = "审批结果 （枚举定义：0=已发起，1=待审批，2=审批通过，3=审批驳回，4=已撤回）")
-	private Integer checkState;
-	/**
-	* 审核时间
-	*/
-	@ApiModelProperty(value = "审核时间")
-	private Date checkTime;
-	/**
-	* 意见
-	*/
-	@ApiModelProperty(value = "意见")
-	private String suggestions;
-	/**
-	* 关联编号
-	*/
-	@ApiModelProperty(value = "关联编号")
-	private String linkId;
-	/**
-	* 审批事项
-	*/
-	@ApiModelProperty(value = "审批事项")
-	private String approvalItem;
+    /**
+     * 流程编号
+     */
+    @ApiModelProperty(value = "流程编号")
+    private String flowId;
+    /**
+     * 当前节点
+     */
+    @ApiModelProperty(value = "当前节点")
+    private String nodeId;
+    /**
+     * 上个节点
+     */
+    @ApiModelProperty(value = "上个节点")
+    private String preNodeId;
+    /**
+     * 下个节点
+     */
+    @ApiModelProperty(value = "下个节点")
+    private String nextNodeId;
+    /**
+     * 审批人
+     */
+    @ApiModelProperty(value = "审批人")
+    private String checkUserId;
+    /**
+     * 审批结果 （枚举定义：0=已发起，1=待审批，2=审批通过，3=审批驳回，4=已撤回）
+     */
+    @ApiModelProperty(value = "审批结果 （枚举定义：0=已发起，1=待审批，2=审批通过，3=审批驳回，4=已撤回）")
+    private Integer checkState;
+    /**
+     * 审核时间
+     */
+    @ApiModelProperty(value = "审核时间")
+    private Date checkTime;
+    /**
+     * 意见
+     */
+    @ApiModelProperty(value = "意见")
+    private String suggestions;
+    /**
+     * 关联编号
+     */
+    @ApiModelProperty(value = "关联编号")
+    private String linkId;
+    /**
+     * 审批事项
+     */
+    @ApiModelProperty(value = "审批事项")
+    private String approvalItem;
 
-	/**
-	 * 模型名称
-	 */
-	@TableField(exist = false)
-	private String flowName;
+    /**
+     * 模型名称
+     */
+    @TableField(exist = false)
+    private String flowName;
 
-	/**
-	 * 节点名称
-	 */
-	@TableField(exist = false)
-	private String nodeName;
+    /**
+     * 节点名称
+     */
+    @TableField(exist = false)
+    private String nodeName;
 
-	/**
-	 * 处理人名称
-	 */
-	@TableField(exist = false)
-	private String userName;
+    /**
+     * 处理人名称
+     */
+    @TableField(exist = false)
+    private String userName;
 }

hx-service-api/common-flow-api/src/main/java/com/fjhx/myapp/application/entity/FlowNode.java

@@ -16,17 +16,15 @@
  */
 package com.fjhx.myapp.application.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-
-import com.fjhx.base.BasicEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import io.swagger.annotations.ApiModel;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 流程节点表实体类
@@ -36,37 +34,55 @@ import io.swagger.annotations.ApiModelProperty;
  */
 @Data
 @TableName("act_flow_node")
-public class FlowNode extends BasicEntity {
+public class FlowNode implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    /**
+     * 创建时间
+     */
+    @TableField("CreatedTime")
+    private Date CreatedTime;
 
-	private static final long serialVersionUID = 1L;
+    /**
+     * 更新时间
+     */
+    @TableField("UpdatedTime")
+    private Date UpdatedTime;
 
-	/**
-	* 软删除
-	*/
-	@ApiModelProperty(value = "软删除")
-	@TableField("IsDelete")
-	private Boolean isdelete;
+    /**
+     * 软删除
+     */
+    @ApiModelProperty(value = "软删除")
+    @TableField("IsDelete")
+    private Boolean isdelete;
 
-	/**
-	* 流程编号
-	*/
-	@ApiModelProperty(value = "流程编号")
-	private String flowId;
-	/**
-	* 节点名称
-	*/
-	@ApiModelProperty(value = "节点名称")
-	private String nodeName;
-	/**
-	* 驳回节点
-	*/
-	@ApiModelProperty(value = "驳回节点")
-	private String backNodeId;
-	/**
-	* 审核人角色
-	*/
-	@ApiModelProperty(value = "审核人角色")
-	private String roleKey;
+    /**
+     * 流程编号
+     */
+    @ApiModelProperty(value = "流程编号")
+    private String flowId;
+    /**
+     * 节点名称
+     */
+    @ApiModelProperty(value = "节点名称")
+    private String nodeName;
+    /**
+     * 驳回节点
+     */
+    @ApiModelProperty(value = "驳回节点")
+    private String backNodeId;
+    /**
+     * 审核人角色
+     */
+    @ApiModelProperty(value = "审核人角色")
+    private String roleKey;
 
 
 }

hx-service-api/common-flow-api/src/main/java/com/fjhx/myapp/application/entity/FlowNodeline.java

@@ -16,17 +16,15 @@
  */
 package com.fjhx.myapp.application.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-
-import com.fjhx.base.BasicEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import io.swagger.annotations.ApiModel;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 流程节点连线实体类
@@ -36,47 +34,64 @@ import io.swagger.annotations.ApiModelProperty;
  */
 @Data
 @TableName("act_flow_nodeline")
-public class FlowNodeline extends BasicEntity {
+public class FlowNodeline implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
 
-	private static final long serialVersionUID = 1L;
+    /**
+     * 创建时间
+     */
+    @TableField("CreatedTime")
+    private Date CreatedTime;
 
+    /**
+     * 更新时间
+     */
+    @TableField("UpdatedTime")
+    private Date UpdatedTime;
 
-	/**
-	* 软删除
-	*/
-	@ApiModelProperty(value = "软删除")
-	@TableField("IsDelete")
-	private Boolean isdelete;
-	/**
-	* 流程编号
-	*/
-	@ApiModelProperty(value = "流程编号")
-	private String flowId;
-	/**
-	* 到哪个节点
-	*/
-	@ApiModelProperty(value = "到哪个节点")
-	private String toNodeId;
-	/**
-	* 从哪个节点
-	*/
-	@ApiModelProperty(value = "从哪个节点")
-	private String fromNodeId;
-	/**
-	* 条件类型 （枚举定义：0=Equal，1=NotEqual，2=GreaterEqual，3=LessEqual，4=Contains）
-	*/
-	@ApiModelProperty(value = "条件类型 （枚举定义：0=Equal，1=NotEqual，2=GreaterEqual，3=LessEqual，4=Contains）")
-	private Integer conditionType;
-	/**
-	* 条件值
-	*/
-	@ApiModelProperty(value = "条件值")
-	private String conditionValue;
-	/**
-	* 条件字段
-	*/
-	@ApiModelProperty(value = "条件字段")
-	private String conditionKey;
+    /**
+     * 软删除
+     */
+    @ApiModelProperty(value = "软删除")
+    @TableField("IsDelete")
+    private Boolean isdelete;
+    /**
+     * 流程编号
+     */
+    @ApiModelProperty(value = "流程编号")
+    private String flowId;
+    /**
+     * 到哪个节点
+     */
+    @ApiModelProperty(value = "到哪个节点")
+    private String toNodeId;
+    /**
+     * 从哪个节点
+     */
+    @ApiModelProperty(value = "从哪个节点")
+    private String fromNodeId;
+    /**
+     * 条件类型 （枚举定义：0=Equal，1=NotEqual，2=GreaterEqual，3=LessEqual，4=Contains）
+     */
+    @ApiModelProperty(value = "条件类型 （枚举定义：0=Equal，1=NotEqual，2=GreaterEqual，3=LessEqual，4=Contains）")
+    private Integer conditionType;
+    /**
+     * 条件值
+     */
+    @ApiModelProperty(value = "条件值")
+    private String conditionValue;
+    /**
+     * 条件字段
+     */
+    @ApiModelProperty(value = "条件字段")
+    private String conditionKey;
 
 
 }

hx-service-api/common-rocketmq-api/src/main/java/com/fjhx/myapp/application/entity/MessageNotice.java

@@ -1,11 +1,15 @@
 package com.fjhx.myapp.application.entity;
 
-import com.fjhx.base.BasicEntity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.fjhx.myapp.application.enums.MessageNoticeEnum;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import org.springframework.data.redis.core.index.Indexed;
 
+import java.io.Serializable;
+import java.util.Date;
+
 
 /**
  * @ClassName: MessageNotice
@@ -14,10 +18,28 @@ import org.springframework.data.redis.core.index.Indexed;
  * @Version: 1.0
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
-public class MessageNotice extends BasicEntity {
+public class MessageNotice implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
 
     /**
+     * 创建时间
+     */
+    @TableField("CreatedTime")
+    private Date CreatedTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("UpdatedTime")
+    private Date UpdatedTime;
+    /**
      * 业务id
      */
     @Indexed

hx-service-api/iot-management-api/pom.xml

@@ -19,7 +19,7 @@
     <dependencies>
         <dependency>
             <groupId>com.fjhx</groupId>
-            <artifactId>common-file-api</artifactId>
+            <artifactId>service-file-api</artifactId>
         </dependency>
     </dependencies>
 

hx-service-api/pom.xml

@@ -22,10 +22,10 @@
     </properties>
 
     <modules>
-        <module>common-file-api</module>
+        <module>service-file-api</module>
         <module>common-flow-api</module>
         <module>common-rocketmq-api</module>
-        <module>common-video-api</module>
+        <module>service-video-api</module>
         <module>iot-management-api</module>
         <module>iot-production-api</module>
         <module>storage-api</module>
@@ -57,7 +57,7 @@
 
             <dependency>
                 <groupId>com.fjhx</groupId>
-                <artifactId>common-file-api</artifactId>
+                <artifactId>service-file-api</artifactId>
                 <version>${hx.version}</version>
             </dependency>
 

hx-service-api/common-file-api/pom.xml → hx-service-api/service-file-api/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>common-file-api</artifactId>
+    <artifactId>service-file-api</artifactId>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>

hx-service-api/common-video-api/pom.xml → hx-service-api/service-video-api/pom.xml

@@ -9,12 +9,12 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>common-video-api</artifactId>
+    <artifactId>service-video-api</artifactId>
 
     <dependencies>
         <dependency>
             <groupId>com.fjhx</groupId>
-            <artifactId>common-file-api</artifactId>
+            <artifactId>service-file-api</artifactId>
         </dependency>
     </dependencies>
 

hx-service/iot-management/pom.xml

@@ -35,7 +35,7 @@
 
         <dependency>
             <groupId>com.fjhx</groupId>
-            <artifactId>common-file-api</artifactId>
+            <artifactId>service-file-api</artifactId>
         </dependency>
 
     </dependencies>

hx-service/iot-production/pom.xml

@@ -25,7 +25,7 @@
 
         <dependency>
             <groupId>com.fjhx</groupId>
-            <artifactId>common-file-api</artifactId>
+            <artifactId>service-file-api</artifactId>
         </dependency>
 
         <dependency>

hx-service/pom.xml

@@ -84,7 +84,7 @@
 
             <dependency>
                 <groupId>com.fjhx</groupId>
-                <artifactId>common-file-api</artifactId>
+                <artifactId>service-file-api</artifactId>
                 <version>${hx.version}</version>
             </dependency>
 

hx-service/storage/src/main/java/com/fjhx/purchase/service/impl/PurchaseContractServiceImpl.java

@@ -1,12 +1,12 @@
 package com.fjhx.purchase.service.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.fjhx.utils.DateUtil;
-import com.fjhx.utils.ListUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.entity.purchase.PurchaseContract;
 import com.fjhx.purchase.mapper.PurchaseContractMapper;
 import com.fjhx.purchase.service.PurchaseContractService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.utils.DateUtil;
+import com.fjhx.utils.ListUtil;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springframework.stereotype.Service;
 
@@ -30,6 +30,7 @@ public class PurchaseContractServiceImpl extends ServiceImpl<PurchaseContractMap
 
     /**
      * 校验是否为第一次购买此物料得供应商
+     *
      * @param supplierId
      * @param materialCode
      * @return
@@ -37,13 +38,14 @@ public class PurchaseContractServiceImpl extends ServiceImpl<PurchaseContractMap
     @Override
     public int checkNewSupplier(String supplierId, String materialCode) {
         int count = baseMapper.selectCount(Wrappers.<PurchaseContract>query().lambda().
-                eq(PurchaseContract::getSupplierId,supplierId).
-                eq(PurchaseContract::getMaterialCode,materialCode));
+                eq(PurchaseContract::getSupplierId, supplierId).
+                eq(PurchaseContract::getMaterialCode, materialCode));
         return count;
     }
 
     /**
      * 上次面料采购
+     *
      * @param materialCode
      * @return
      */
@@ -54,52 +56,54 @@ public class PurchaseContractServiceImpl extends ServiceImpl<PurchaseContractMap
 
     /**
      * 合同历史付款记录
+     *
      * @return
      */
     @Override
-    public List<Map<String,Object>> historyPayList() {
+    public List<Map<String, Object>> historyPayList() {
         return baseMapper.historyPayList();
     }
 
     /**
      * 历史付款列表
+     *
      * @param condition
      * @return
      */
     @Override
     public List<PurchaseContract> getPayList(Map<String, Object> condition) throws ParseException {
         List<PurchaseContract> list = baseMapper.getPayList(condition);
-        Map<String,Object> map = new HashMap<>();
+        Map<String, Object> map = new HashMap<>();
         //初始化map集合
-        map.put("subscribeCheck",true);
-        map.put("inoutBillCheck",false);
-        map.put("quantityCheck",false);
-        map.put("ContractCheck",false);
-        map.put("invoiceCheck",false);
-        map.put("payDate",null);
-        for(PurchaseContract p:list){
+        map.put("subscribeCheck", true);
+        map.put("inoutBillCheck", false);
+        map.put("quantityCheck", false);
+        map.put("ContractCheck", false);
+        map.put("invoiceCheck", false);
+        map.put("payDate", null);
+        for (PurchaseContract p : list) {
             //处理是否入库判定
-            if(ObjectUtil.isNotEmpty(p.getPurContractState())&&p.getPurContractState()==3){
-                map.put("inoutBillCheck",true);
+            if (ObjectUtil.isNotEmpty(p.getPurContractState()) && p.getPurContractState() == 3) {
+                map.put("inoutBillCheck", true);
             }
             //处理是否质检判定
-            if(ObjectUtil.isNotEmpty(p.getQuantityStatus())){
-                map.put("quantityCheck",ListUtil.checkList(Arrays.asList(p.getQuantityStatus()),"1"));
+            if (ObjectUtil.isNotEmpty(p.getQuantityStatus())) {
+                map.put("quantityCheck", ListUtil.checkList(Arrays.asList(p.getQuantityStatus()), "1"));
             }
             //处理合同判定
-            if(ObjectUtil.isNotEmpty(p.getContractStatus())&&
-                    p.getContractStatus().contains("3")){
-                map.put("ContractCheck",true);
+            if (ObjectUtil.isNotEmpty(p.getContractStatus()) &&
+                    p.getContractStatus().contains("3")) {
+                map.put("ContractCheck", true);
             }
             //处理发票判定
-            if(ObjectUtil.isNotEmpty(p.getContractAmount())
-                &&p.getContractAmount().compareTo(p.getApplyPayAmount())>-1){
-                map.put("invoiceCheck",true);
+            if (ObjectUtil.isNotEmpty(p.getContractAmount())
+                    && p.getContractAmount().compareTo(p.getApplyPayAmount()) > -1) {
+                map.put("invoiceCheck", true);
             }
             //处理付款期限
-            if(ObjectUtil.isNotEmpty(p.getCompleteStockTime())){
-                String date = DateUtil.dateMinusMonth(p.getCompleteStockTime(),p.getAccountDate());
-                map.put("payDate",DateUtil.differenceDate(date));
+            if (ObjectUtil.isNotEmpty(p.getCompleteStockTime())) {
+                String date = DateUtil.dateMinusMonth(p.getCompleteStockTime(), p.getAccountDate());
+                map.put("payDate", DateUtil.differenceDate(date));
             }
             p.setCheck(map);
         }
@@ -108,6 +112,7 @@ public class PurchaseContractServiceImpl extends ServiceImpl<PurchaseContractMap
 
     /**
      * 历史付款列表--条数
+     *
      * @param condition
      * @return
      */
@@ -118,16 +123,18 @@ public class PurchaseContractServiceImpl extends ServiceImpl<PurchaseContractMap
 
     /**
      * 统计供应商总付款金额
+     *
      * @param condition
      * @return
      */
     @Override
-    public List<Map<String,Object>> getPayGroupBySu(Map<String, Object> condition) {
+    public List<Map<String, Object>> getPayGroupBySu(Map<String, Object> condition) {
         return baseMapper.getPayGroupBySu(condition);
     }
 
     /**
      * 获取总金额
+     *
      * @param date
      * @return
      */

hx-service/storage/src/main/java/com/fjhx/stock/mapper/StockDetailMapper.xml

@@ -36,7 +36,7 @@
                        and ss.material_status = 0
                        and ss.is_delete = 0
                  )
-                 union
+                 union all
                  (
                      select ss.id,
                             ss.paper_quantity availableQuantity,
@@ -75,7 +75,7 @@
                 ss.printer           jobNo
          from stock_scheduling ss
              ${ew.customSqlSegment})
-        union
+        union all
         (select ss.paper_code     code,
                 ss.paper_quantity quantity,
                 ss.paper_man      jobNo
@@ -102,7 +102,7 @@
             and ss.printer = #{jobNo}
         </if>
         )
-        union
+        union all
         (
         select
         ss.paper_code code,
@@ -157,7 +157,7 @@
                        ss.material_flag flag
                 from stock_scheduling ss
             )
-            union
+            union all
             (
                 select ss.plan_date  plan_date,
                        ss.paper_flag flag