提交

README.md

@@ -1,2 +1,2 @@
-# yiliangyiyun
+# com.yh.saas.plugin.yiliangyiyun
 

pom.xml

@@ -36,7 +36,7 @@
 <!--        <module>winsea-haixin-plugin-finance</module>-->
         <module>winsea-haixin-plugin-operation</module>
 <!--        <module>winsea-haixin-plugin-repair</module>-->
-        <module>winsea-haixin-plugin-yiliangyiyun</module>
+        <module>winsea-haixin-plugin-com.yh.saas.plugin.yiliangyiyun</module>
     </modules>
 
     <repositories>

src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/CommonSysParameterController.java

@@ -1,21 +0,0 @@
-package com.yh.saas.plugin.yiliangyiyun.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 记录系统用到的变量 前端控制器
- * </p>
- *
- * @author Gongdc
- * @since 2021-05-18
- */
-@RestController
-@RequestMapping("/commonSysParameter")
-public class CommonSysParameterController {
-
-}
-

src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/ContractProcessInfoController.java

@@ -1,21 +0,0 @@
-package com.yh.saas.plugin.yiliangyiyun.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 合同流程信息 前端控制器
- * </p>
- *
- * @author Gongdc
- * @since 2021-05-17
- */
-@RestController
-@RequestMapping("/contractProcessInfo")
-public class ContractProcessInfoController {
-
-}
-

src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/CommonSysParameter.java

@@ -1,63 +0,0 @@
-package com.yh.saas.plugin.yiliangyiyun.entity;
-
-import com.baomidou.mybatisplus.activerecord.Model;
-import BaseModel;
-import java.io.Serializable;
-
-import com.baomidou.mybatisplus.annotations.Version;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 记录系统用到的变量
- * </p>
- *
- * @author Gongdc
- * @since 2021-05-18
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-public class CommonSysParameter extends BaseModel<CommonSysParameter> {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    private String id;
-    /**
-     * 变量类别ID
-     */
-    private String constId;
-    /**
-     * 变量类别名
-     */
-    private String constName;
-    /**
-     * 变量Key（自增数字形式）
-     */
-    private String constKey;
-    /**
-     * 变量值
-     */
-    private String constValue;
-    /**
-     * 英文变量值
-     */
-    private String constValueEn;
-    /**
-     * 变量描述
-     */
-    private String constDescription;
-
-
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
-
-}

src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/ContractProcessInfo.java

@@ -1,79 +0,0 @@
-package com.yh.saas.plugin.yiliangyiyun.entity;
-
-import com.baomidou.mybatisplus.activerecord.Model;
-import BaseModel;
-import java.io.Serializable;
-
-import com.baomidou.mybatisplus.annotations.Version;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 合同流程信息
- * </p>
- *
- * @author Gongdc
- * @since 2021-05-17
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-public class ContractProcessInfo extends BaseModel<ContractProcessInfo> {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * ID
-     */
-    private String id;
-    /**
-     * 公司
-     */
-    private String compId;
-    /**
-     * 合同ID
-     */
-    private String contractId;
-    /**
-     * 合同收入（元）
-     */
-    private Double goodsNameKey;
-    /**
-     * 已开发票
-     */
-    private Double goodsName;
-    /**
-     * 合同外支出
-     */
-    private Double waterContent;
-    /**
-     * 未开发票
-     */
-    private Double impurity;
-    /**
-     * 未收款
-     */
-    private Double mildewGrain;
-    /**
-     * 已完成发运量（吨）
-     */
-    private Float imperfectGrain;
-    /**
-     * 双章原件回收情况key
-     */
-    private String gradeKey;
-    /**
-     * 双章原件回收情况
-     */
-    private String grade;
-
-
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
-
-}

src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/CommonSysParameterMapper.java

@@ -1,16 +0,0 @@
-package com.yh.saas.plugin.yiliangyiyun.mapper;
-
-import com.yh.saas.plugin.yiliangyiyun.entity.CommonSysParameter;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-
-/**
- * <p>
- * 记录系统用到的变量 Mapper 接口
- * </p>
- *
- * @author Gongdc
- * @since 2021-05-18
- */
-public interface CommonSysParameterMapper extends BaseMapper<CommonSysParameter> {
-
-}

src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/ContractProcessInfoMapper.java

@@ -1,16 +0,0 @@
-package com.yh.saas.plugin.yiliangyiyun.mapper;
-
-import com.yh.saas.plugin.yiliangyiyun.entity.ContractProcessInfo;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-
-/**
- * <p>
- * 合同流程信息 Mapper 接口
- * </p>
- *
- * @author Gongdc
- * @since 2021-05-17
- */
-public interface ContractProcessInfoMapper extends BaseMapper<ContractProcessInfo> {
-
-}

src/main/java/com/yh/saas/plugin/yiliangyiyun/service/ICommonSysParameterService.java

@@ -1,16 +0,0 @@
-package com.yh.saas.plugin.yiliangyiyun.service;
-
-import com.yh.saas.plugin.yiliangyiyun.entity.CommonSysParameter;
-import com.baomidou.mybatisplus.service.IService;
-
-/**
- * <p>
- * 记录系统用到的变量 服务类
- * </p>
- *
- * @author Gongdc
- * @since 2021-05-18
- */
-public interface ICommonSysParameterService extends IService<CommonSysParameter> {
-
-}

src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IContractProcessInfoService.java

@@ -1,16 +0,0 @@
-package com.yh.saas.plugin.yiliangyiyun.service;
-
-import com.yh.saas.plugin.yiliangyiyun.entity.ContractProcessInfo;
-import com.baomidou.mybatisplus.service.IService;
-
-/**
- * <p>
- * 合同流程信息 服务类
- * </p>
- *
- * @author Gongdc
- * @since 2021-05-17
- */
-public interface IContractProcessInfoService extends IService<ContractProcessInfo> {
-
-}

src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/CommonSysParameterServiceImpl.java

@@ -1,20 +0,0 @@
-package com.yh.saas.plugin.yiliangyiyun.service.impl;
-
-import com.yh.saas.plugin.yiliangyiyun.entity.CommonSysParameter;
-import com.yh.saas.plugin.yiliangyiyun.mapper.CommonSysParameterMapper;
-import com.yh.saas.plugin.yiliangyiyun.service.ICommonSysParameterService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 记录系统用到的变量 服务实现类
- * </p>
- *
- * @author Gongdc
- * @since 2021-05-18
- */
-@Service
-public class CommonSysParameterServiceImpl extends ServiceImpl<CommonSysParameterMapper, CommonSysParameter> implements ICommonSysParameterService {
-
-}

src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/ContractProcessInfoServiceImpl.java

@@ -1,20 +0,0 @@
-package com.yh.saas.plugin.yiliangyiyun.service.impl;
-
-import com.yh.saas.plugin.yiliangyiyun.entity.ContractProcessInfo;
-import com.yh.saas.plugin.yiliangyiyun.mapper.ContractProcessInfoMapper;
-import com.yh.saas.plugin.yiliangyiyun.service.IContractProcessInfoService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 合同流程信息 服务实现类
- * </p>
- *
- * @author Gongdc
- * @since 2021-05-17
- */
-@Service
-public class ContractProcessInfoServiceImpl extends ServiceImpl<ContractProcessInfoMapper, ContractProcessInfo> implements IContractProcessInfoService {
-
-}

src/main/resources/mapper/CommonSysParameterMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yh.saas.plugin.yiliangyiyun.mapper.CommonSysParameterMapper">
-
-</mapper>

src/main/resources/mapper/ContractProcessInfoMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yh.saas.plugin.yiliangyiyun.mapper.ContractProcessInfoMapper">
-
-</mapper>

winsea-haixin-plugin-servicer/src/main/java/com/yh/saas/plugin/servicer/service/impl/ServicerMerchantInfoServiceImpl.java

@@ -122,6 +122,7 @@ public class ServicerMerchantInfoServiceImpl extends ServiceImpl<ServicerMerchan
 
     @Override
     public Page<ServicerMerchantInfo> selectPageByCondition(PageView pageView) {
+
         // 状态类型（0：全部，1：待处理，2：待跟踪）
         String statusType = (String) pageView.get("statusType");
         User currentUser = AuthSecurityUtils.getCurrentUserInfo();

winsea-haixin-plugin-yiliangyiyun/pom.xml

@@ -33,6 +33,10 @@
             <artifactId>spring-boot</artifactId>
             <version>2.1.1.RELEASE</version>
         </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
     </dependencies>
 
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/GeneratorCodeByTables.java → winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/GeneratorCodeByTables.java

@@ -1,4 +1,4 @@
-package com.yh.saas.plugin.yiliangyiyun;
+package com.yh.saas.plugin;
 
 import java.io.File;
 import java.io.IOException;
@@ -54,7 +54,7 @@ public class GeneratorCodeByTables {
 
     public static void main(String[] args) throws IOException {
 //        generateByTables("Gongdc", "com.yh.saas.plugin.crew","crew_interview_info");
-        generateByTables("Gongdc", "com.yh.saas.plugin.yiliangyiyun","common_sys_parameter");
+        generateByTables("Gongdc", "com.yh.saas.plugin.com.yh.saas.plugin.yiliangyiyun","common_sys_parameter");
     }
 
     /**

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/CommonSysParameterController.java

@@ -1,10 +1,7 @@
 package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
-import com.yh.saas.plugin.yiliangyiyun.entity.CommonSysParameter;
-import com.yh.saas.plugin.yiliangyiyun.entity.ContractManagementInfo;
 import com.yh.saas.plugin.yiliangyiyun.service.ICommonSysParameterService;
-import com.yh.saas.plugin.yiliangyiyun.service.IContractManagementInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/ContractManagementInfoController.java

@@ -8,12 +8,10 @@ import com.yh.saas.plugin.yiliangyiyun.service.IContractManagementInfoService;
 //import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.plugins.Page;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 /**
  * <p>

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/CommonSysParameter.java

@@ -1,10 +1,9 @@
 package com.yh.saas.plugin.yiliangyiyun.entity;
 
-import com.baomidou.mybatisplus.activerecord.Model;
 import java.io.Serializable;
 
 import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.Version;
+import com.baomidou.mybatisplus.annotations.TableName;
 
 import com.baomidou.mybatisplus.enums.IdType;
 import com.yh.saas.common.support.entity.BaseModel;
@@ -23,6 +22,7 @@ import lombok.experimental.Accessors;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
+@TableName("common_sys_parameter")
 public class CommonSysParameter extends BaseModel<CommonSysParameter> {
 
     private static final long serialVersionUID = 1L;

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/ContractGoodsInfo.java

@@ -1,12 +1,9 @@
 package com.yh.saas.plugin.yiliangyiyun.entity;
 
-import com.baomidou.mybatisplus.activerecord.Model;
 import java.io.Serializable;
 
-import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.annotations.Version;
 
 import com.baomidou.mybatisplus.enums.IdType;
 import com.yh.saas.common.support.entity.BaseModel;

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/ContractManagementInfo.java

@@ -2,14 +2,11 @@ package com.yh.saas.plugin.yiliangyiyun.entity;
 
 import java.util.Date;
 
-import com.baomidou.mybatisplus.activerecord.Model;
-
 import java.io.Serializable;
 
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.annotations.Version;
 
 import com.baomidou.mybatisplus.enums.IdType;
 import com.fasterxml.jackson.annotation.JsonFormat;

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/ContractProcessInfo.java

@@ -1,12 +1,9 @@
 package com.yh.saas.plugin.yiliangyiyun.entity;
 
-import com.baomidou.mybatisplus.activerecord.Model;
 import java.io.Serializable;
 
-import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.annotations.Version;
 
 import com.baomidou.mybatisplus.enums.IdType;
 import com.yh.saas.common.support.entity.BaseModel;

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/ContractManagementInfoMapper.java

@@ -3,7 +3,6 @@ package com.yh.saas.plugin.yiliangyiyun.mapper;
 
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.yh.saas.plugin.yiliangyiyun.entity.ContractManagementInfo;
-import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.List;
 import java.util.Map;

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/ICommonSysParameterService.java

@@ -2,9 +2,7 @@ package com.yh.saas.plugin.yiliangyiyun.service;
 
 import com.yh.saas.plugin.yiliangyiyun.entity.CommonSysParameter;
 import com.baomidou.mybatisplus.service.IService;
-import com.yh.saas.plugin.yiliangyiyun.entity.ContractManagementInfo;
 
-import java.util.List;
 import java.util.Map;
 
 /**

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IContractManagementInfoService.java

@@ -1,13 +1,9 @@
 package com.yh.saas.plugin.yiliangyiyun.service;
 
-import com.winsea.svc.base.base.util.page.PageView;
 import com.yh.saas.plugin.yiliangyiyun.entity.ContractManagementInfo;
 import com.baomidou.mybatisplus.service.IService;
 import com.baomidou.mybatisplus.plugins.Page;
 
-import java.util.List;
-import java.util.Map;
-
 /**
  * <p>
  * 合同管理 服务类

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/CommonSysParameterServiceImpl.java

@@ -3,9 +3,6 @@ package com.yh.saas.plugin.yiliangyiyun.service.impl;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.toolkit.CollectionUtils;
 import com.yh.saas.plugin.yiliangyiyun.entity.CommonSysParameter;
-import com.yh.saas.plugin.yiliangyiyun.entity.ContractGoodsInfo;
-import com.yh.saas.plugin.yiliangyiyun.entity.ContractManagementInfo;
-import com.yh.saas.plugin.yiliangyiyun.entity.ContractProcessInfo;
 import com.yh.saas.plugin.yiliangyiyun.mapper.CommonSysParameterMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.ICommonSysParameterService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/ContractGoodsInfoServiceImpl.java

@@ -1,8 +1,8 @@
 package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
-import com.yh.saas.plugin.yiliangyiyun.entity.ContractGoodsInfo;
 import com.yh.saas.plugin.yiliangyiyun.mapper.ContractGoodsInfoMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.IContractGoodsInfoService;
+import com.yh.saas.plugin.yiliangyiyun.entity.ContractGoodsInfo;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/ContractManagementInfoServiceImpl.java

@@ -3,25 +3,21 @@ package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
 import com.alipay.sofa.runtime.api.annotation.SofaService;
 import com.yh.saas.common.support.util.IdGenerator;
+import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
+import com.yh.saas.plugin.yiliangyiyun.entity.ContractProcessInfo;
+import com.yh.saas.plugin.yiliangyiyun.mapper.ContractManagementInfoMapper;
+import com.yh.saas.plugin.yiliangyiyun.service.IContractGoodsInfoService;
+import com.yh.saas.plugin.yiliangyiyun.service.IContractProcessInfoService;
 import com.yh.saas.plugin.yiliangyiyun.entity.ContractGoodsInfo;
 import com.google.common.collect.Lists;
-import com.winsea.svc.base.base.util.page.PageView;
-import com.winsea.svc.base.security.entity.User;
 import com.winsea.svc.base.security.util.AuthSecurityUtils;
 import com.yh.saas.plugin.yiliangyiyun.entity.ContractManagementInfo;
-import com.yh.saas.plugin.yiliangyiyun.entity.ContractProcessInfo;
-import com.yh.saas.plugin.yiliangyiyun.mapper.ContractManagementInfoMapper;
-import com.yh.saas.plugin.yiliangyiyun.service.IContractGoodsInfoService;
 import com.yh.saas.plugin.yiliangyiyun.service.IContractManagementInfoService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.yh.saas.plugin.yiliangyiyun.service.IContractProcessInfoService;
-import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import com.baomidou.mybatisplus.plugins.Page;
-import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import org.springframework.transaction.annotation.Transactional;
 
 
 import java.util.HashMap;

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/ContractManagementInfoMapper.xml

@@ -32,7 +32,7 @@
         </if>
         <if test="searchType != null and searchType != ''">
             AND (lower(m.contract_id) like lower(CONCAT('%',#{searchKeyWord},'%'))
-            OR lower( m.buyer) like lower(CONCAT('%',#{searchKeyWord},'%')))
+            OR lower( m.buyer) like lower(CONCAT('%',#{searchKeyWord},'%'))
             OR lower( m.seller) like lower(CONCAT('%',#{searchKeyWord},'%')))
         </if>
     </select>
@@ -80,7 +80,7 @@
         </if>
         <if test="searchType != null and searchType != ''">
             AND (lower(m.contract_id) like lower(CONCAT('%',#{searchKeyWord},'%'))
-            OR lower( m.buyer) like lower(CONCAT('%',#{searchKeyWord},'%')))
+            OR lower( m.buyer) like lower(CONCAT('%',#{searchKeyWord},'%'))
             OR lower( m.seller) like lower(CONCAT('%',#{searchKeyWord},'%')))
         </if>
         ORDER BY m.signing_date DESC