修改

winsea-haixin-platform-backend/src/main/java/com/yh/saas/platform/controller/AppendixController.java

@@ -13,15 +13,11 @@ import com.winsea.svc.base.base.entity.CommonAppendix;
 import com.winsea.svc.base.base.service.IAppendixService;
 import com.winsea.svc.base.base.util.AppendixWrapper;
 import com.winsea.svc.base.base.util.ClientTypeChecker;
-import com.winsea.svc.base.base.util.DateUtils;
 import com.winsea.svc.base.base.view.CommonAppendixView;
 import com.winsea.svc.base.security.util.AuthSecurityUtils;
 import com.yh.saas.platform.util.GtAppendixUtil;
-import com.yh.saas.plugin.yiliangyiyun.util.GeneratorUtil;
 import lombok.Getter;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.tomcat.util.http.fileupload.util.Streams;
-import org.apache.velocity.shaded.commons.io.FilenameUtils;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,7 +30,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.net.URLDecoder;
-import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.text.MessageFormat;
 import java.util.*;
@@ -91,8 +86,8 @@ public class AppendixController implements InitializingBean {
     @Getter
     @Value("${oss.endpoint.internal:}")
     private String baseUrl;
-    @Autowired
-    private OSSClient ossClient;
+//    @Autowired
+//    private OSSClient ossClient;
     @Override
     public void afterPropertiesSet() throws Exception {
         host = "http://" + bucketName + "." + endpoint;
@@ -346,7 +341,7 @@ public class AppendixController implements InitializingBean {
         objectMetadata.setContentLength(file.getSize());
         objectMetadata.setContentType(file.getContentType());
         PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, "eliangeyun/"+companyId+"/" +name, file.getInputStream(), objectMetadata);
-        ossClient.putObject(putObjectRequest);
+//        ossClient.putObject(putObjectRequest);
         return baseUrl + "eliangeyun/" +companyId+"/" +name;
     }
 }

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

@@ -42,25 +42,6 @@ public class AcquisitionInfoController {
         return iAcquisitionInfoService.selectAcquisitionPage(acquisitionInfo);
     }
 
-    /**
-     * 关注
-     * @param acquisitionInfo
-     * @return
-     */
-    @PostMapping("/api/follow")
-    public String follow(@RequestBody AcquisitionInfo acquisitionInfo){
-        return iAcquisitionInfoService.follow(acquisitionInfo);
-    }
-
-    /**
-     * 取消关注
-     * @param acquisitionInfo
-     * @return
-     */
-    @PostMapping("/api/followNot")
-    public String followNot(@RequestBody AcquisitionInfo acquisitionInfo){
-        return iAcquisitionInfoService.followNot(acquisitionInfo);
-    }
 
     /**
      * 查看收购信息

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

@@ -1,47 +0,0 @@
-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.enums.IdType;
-import com.yh.saas.common.support.entity.BaseModel;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 公司、粮商身份关系表
- * </p>
- *
- * @author Gongdc
- * @since 2021-09-02
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-public class CommonCompanyIdentity extends BaseModel<CommonCompanyIdentity> {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 公司id
-     */
-
-    @TableId(type = IdType.UUID)
-    private String comId;
-    /**
-     * 身份认证表id
-     */
-    private String identityId;
-
-
-    @Override
-    protected Serializable pkVal() {
-        return null;
-    }
-
-}

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

@@ -1,16 +0,0 @@
-package com.yh.saas.plugin.yiliangyiyun.mapper;
-
-import com.yh.saas.plugin.yiliangyiyun.entity.CommonCompanyIdentity;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-
-/**
- * <p>
- * 公司、粮商身份关系表 Mapper 接口
- * </p>
- *
- * @author ccj
- * @since 2021-09-02
- */
-public interface CommonCompanyIdentityMapper extends BaseMapper<CommonCompanyIdentity> {
-
-}

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

@@ -1,16 +0,0 @@
-package com.yh.saas.plugin.yiliangyiyun.mapper;
-
-import com.yh.saas.plugin.yiliangyiyun.entity.CommonConstantFalse;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-
-/**
- * <p>
- * 增量比数据 Mapper 接口
- * </p>
- *
- * @author Gdc
- * @since 2021-11-24
- */
-public interface CommonConstantFalseMapper extends BaseMapper<CommonConstantFalse> {
-
-}

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

@@ -26,17 +26,6 @@ public interface IAcquisitionInfoService extends IService<AcquisitionInfo> {
      */
     List<AcquisitionInfo> selectAcquisitionPage(AcquisitionInfo acquisitionInfo);
 
-    /**
-     * 关注
-     * @param  acquisitionInfo
-     */
-    String follow(AcquisitionInfo acquisitionInfo);
-
-    /**
-     * 取消关注
-     * @param  acquisitionInfo
-     */
-    String followNot(AcquisitionInfo acquisitionInfo);
 
     /**
      * 查看收购信息

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

@@ -1,16 +0,0 @@
-package com.yh.saas.plugin.yiliangyiyun.service;
-
-import com.yh.saas.plugin.yiliangyiyun.entity.CommonCompanyIdentity;
-import com.baomidou.mybatisplus.service.IService;
-
-/**
- * <p>
- * 公司、粮商身份关系表 服务类
- * </p>
- *
- * @author Gongdc
- * @since 2021-09-02
- */
-public interface ICommonCompanyIdentityService extends IService<CommonCompanyIdentity> {
-
-}

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

@@ -1,23 +0,0 @@
-package com.yh.saas.plugin.yiliangyiyun.service;
-
-import com.yh.saas.plugin.yiliangyiyun.entity.CommonConstantFalse;
-import com.baomidou.mybatisplus.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 增量比数据 服务类
- * </p>
- *
- * @author Gdc
- * @since 2021-11-24
- */
-public interface ICommonConstantFalseService extends IService<CommonConstantFalse> {
-
-    /**
-     * 查看
-     * @param
-     */
-    List<CommonConstantFalse> getInfo();
-}

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

@@ -0,0 +1,213 @@
+package com.yh.saas.plugin.yiliangyiyun.service.impl;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.google.common.collect.Lists;
+import com.winsea.svc.base.base.entity.CommonStaff;
+import com.winsea.svc.base.base.entity.CommonStaffRole;
+import com.winsea.svc.base.base.service.ICommonRoleResourceService;
+import com.winsea.svc.base.base.service.ICommonStaffRoleService;
+import com.winsea.svc.base.base.service.ICommonStaffService;
+import com.winsea.svc.base.security.util.AuthSecurityUtils;
+import com.winsea.svc.notice.entity.NoticeTaskInfo;
+import com.winsea.svc.notice.entity.base.BaseNotice;
+import com.winsea.svc.notice.service.INoticeService;
+import com.winsea.svc.notice.service.INoticeTaskService;
+import com.yh.saas.common.support.util.IdGenerator;
+import com.yh.saas.common.support.util.StringUtils;
+import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
+import com.yh.saas.plugin.yiliangyiyun.entity.AcquisitionInfo;
+import com.yh.saas.plugin.yiliangyiyun.mapper.AcquisitionInfoMapper;
+import com.yh.saas.plugin.yiliangyiyun.service.IAcquisitionInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 记录收购信息 服务实现类
+ * </p>
+ *
+ * @author Gdc
+ * @since 2021-11-26
+ */
+@Service
+public class AcquisitionInfoServiceImpl extends ServiceImpl<AcquisitionInfoMapper, AcquisitionInfo> implements IAcquisitionInfoService {
+
+
+    @Autowired
+    private INoticeService noticeService;
+    @Autowired
+    private INoticeTaskService noticeTaskService;
+    @Autowired
+    private ICommonStaffService staffService;
+    @Autowired
+    private ICommonStaffRoleService commonStaffRoleService;
+    @Autowired
+    private ICommonRoleResourceService roleResourceService;
+
+    /**
+     * 收购信息列表
+     * @param
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public List<AcquisitionInfo> selectAcquisitionPage(AcquisitionInfo acquisitionInfo){
+        Map<String, Object> pageView = new HashMap<>();
+        pageView.put("searchKeyWord", acquisitionInfo.getSearchKeyWord());
+        pageView.put("phone", acquisitionInfo.getLoginPhone());
+        pageView.put("city", acquisitionInfo.getCity());
+        // 查询收购总数
+        List<AcquisitionInfo> acquisitionInfoList = baseMapper.getListByCondition(pageView);
+        return acquisitionInfoList;
+    }
+
+    /**
+     * 添加收购信息
+     * @param  acquisitionInfo
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public String addAcquisition(AcquisitionInfo acquisitionInfo){
+        //判断id是否为空，空是新增
+        if(StringUtils.isEmpty(acquisitionInfo.getId())){
+            //新增主键id
+            acquisitionInfo.setId(IdGenerator.generateUUID());
+            acquisitionInfo.setCompId(AuthSecurityUtils.getCurrentUserInfo().getCompId());
+            acquisitionInfo.setStatusFlag(StatusEnum.GRAIN_REVIEWED.getFlag());
+            acquisitionInfo.setStatus(StatusEnum.GRAIN_REVIEWED.getName());
+            //操作主表数据
+            this.insert(acquisitionInfo);
+            // 先删除任务
+            noticeService.removeNotice(BaseNotice.NoticeStatus.TASK, "ACQUISITION-SETTLEMENT-APPRPVE",
+                    acquisitionInfo.getId(), null);
+            tesk(acquisitionInfo);
+        }else{
+            //有id是修改
+            acquisitionInfo.setStatusFlag(StatusEnum.GRAIN_REVIEWED.getFlag());
+            acquisitionInfo.setStatus(StatusEnum.GRAIN_REVIEWED.getName());
+            this.updateById(acquisitionInfo);
+            // 先删除任务
+            noticeService.removeNotice(BaseNotice.NoticeStatus.TASK, "ACQUISITION-SETTLEMENT-APPRPVE",
+                    acquisitionInfo.getId(), null);
+            tesk(acquisitionInfo);
+        }
+        return acquisitionInfo.getId();
+    }
+
+
+    /**
+     * 查看收购信息
+     *
+     * @param id
+     * @return
+     */
+    @Override
+    public AcquisitionInfo getAcquisition(String id) {
+        //查看收购信息
+        AcquisitionInfo acquisitionInfo = this.selectById(id);
+        return acquisitionInfo;
+    }
+
+    /**
+     * 收购业务查看
+     *
+     * @param acquisitionInfo
+     * @return
+     */
+    @Override
+    public AcquisitionInfo getInfo(AcquisitionInfo acquisitionInfo) {
+        //根据用户id查看收购信息
+        if(acquisitionInfo.getWarehouseName() == null){
+            AcquisitionInfo acquisitionInfo1 = this.selectOne(new EntityWrapper<AcquisitionInfo>()
+                    .eq("common_id",acquisitionInfo.getCommonId()));
+            return acquisitionInfo1;
+        }
+        AcquisitionInfo acquisitionInfo1 = this.selectOne(new EntityWrapper<AcquisitionInfo>()
+                .eq("common_id",acquisitionInfo.getCommonId())
+                .eq("warehouse_name",acquisitionInfo.getWarehouseName()));
+        return acquisitionInfo1;
+    }
+
+    /**
+     * 审核
+     *
+     * @param acquisitionInfo
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public String examine(AcquisitionInfo acquisitionInfo) {
+        //查询收购信息
+        AcquisitionInfo acquisitionInfo1 = this.selectById(acquisitionInfo.getId());
+        if (acquisitionInfo1 != null) {
+            //通过
+            if (acquisitionInfo.getFlag() == 1) {
+                acquisitionInfo1.setStatusFlag(StatusEnum.GRAIN_ADOPT.getFlag());
+                acquisitionInfo1.setStatus(StatusEnum.GRAIN_ADOPT.getName());
+            }
+            //驳回
+            else {
+                acquisitionInfo1.setStatusFlag(StatusEnum.GRAIN_REJECT.getFlag());
+                acquisitionInfo1.setStatus(StatusEnum.GRAIN_REJECT.getName());
+            }
+            //更改收购信息信息
+            this.updateById(acquisitionInfo1);
+            // 先删除任务
+            noticeService.removeNotice(BaseNotice.NoticeStatus.TASK, "ACQUISITION-SETTLEMENT-APPRPVE",
+                    acquisitionInfo.getId(), null);
+            return "OK";
+        }
+        return "NG";
+    }
+
+
+
+
+    /**
+     * 任务
+     *
+     * @param acquisitionInfo
+     */
+    private void tesk(AcquisitionInfo acquisitionInfo) {
+        List<String> roleIdList = new ArrayList<>();
+        roleIdList = roleResourceService.getBindRoleIdsByResourceIds(AuthSecurityUtils.getCurrentUserInfo().getCompId(),
+                Lists.newArrayList("acquisitionInfor-Delete"));
+        // 先删除任务
+        noticeService.removeNotice(BaseNotice.NoticeStatus.TASK, "ACQUISITION-SETTLEMENT-APPRPVE",
+                acquisitionInfo.getId(), null);
+        String staffName = "XXX";
+        CommonStaff commitUserInfo = staffService.getInfo(AuthSecurityUtils.getCurrentUserId());
+        if (commitUserInfo != null) {
+            staffName = commitUserInfo.getMajorRole() != null
+                    ? commitUserInfo.getMajorRole().getRoleName() + " " + commitUserInfo.getStaffName()
+                    : commitUserInfo.getStaffName();
+        }
+        List<CommonStaffRole> commonStaffRoles = commonStaffRoleService.findStaff(roleIdList);
+        List<String> staffIds = commonStaffRoles.stream().map(CommonStaffRole::getStaffId).collect(Collectors.toList());
+        String taskContent = "";
+        // 向下一步操作人发送任务通知
+        taskContent =  staffName + "提交的 "+acquisitionInfo.getWarehouseName()+" 的收购信息等待审核";
+        NoticeTaskInfo taskInfo = new NoticeTaskInfo();
+        taskInfo.setCompId(commitUserInfo.getCompId());
+        taskInfo.setAcceptType(BaseNotice.AcceptStatus.STAFF);
+        taskInfo.setBusinessId(acquisitionInfo.getId());
+        taskInfo.setBusinessType("ACQ");
+        taskInfo.setMessageContent(taskContent);
+        taskInfo.setBusinessCode("ACQUISITION-SETTLEMENT-APPRPVE");
+//            taskInfo.setNoticeTaskStatus(NoticeTaskInfo.NoticeTaskStatus.RETURN);
+        noticeTaskService.createNoticeTask(staffIds,
+                null, taskInfo);
+
+    }
+
+
+}

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

@@ -1,20 +0,0 @@
-package com.yh.saas.plugin.yiliangyiyun.service.impl;
-
-import com.yh.saas.plugin.yiliangyiyun.entity.CommonCompanyIdentity;
-import com.yh.saas.plugin.yiliangyiyun.mapper.CommonCompanyIdentityMapper;
-import com.yh.saas.plugin.yiliangyiyun.service.ICommonCompanyIdentityService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 公司、粮商身份关系表 服务实现类
- * </p>
- *
- * @author Gongdc
- * @since 2021-09-02
- */
-@Service
-public class CommonCompanyIdentityServiceImpl extends ServiceImpl<CommonCompanyIdentityMapper, CommonCompanyIdentity> implements ICommonCompanyIdentityService {
-
-}

winsea-haixin-plugin-wangluohuoyun/src/main/resources/mapper/CollectionCompanyMapper.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.CollectionCompanyMapper">
-
-</mapper>

winsea-haixin-plugin-wangluohuoyun/src/main/resources/mapper/CollectionManagementMapper.xml

@@ -1,69 +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.CollectionManagementMapper">
-    <!-- 获得收款信息总数 -->
-    <select id="getCountByCondition" parameterType="Map" resultType="java.lang.Integer">
-        SELECT
-        COUNT(id)
-        FROM collection_management
-        WHERE
-        comp_id = #{compId}
-        and delete_flag = '0'
-        <if test="searchType != null and searchType != ''">
-            <if test="searchType == 1">
-                AND status_flag = '1'
-            </if>
-            <if test="searchType == 2">
-                AND status_flag = '3'
-            </if>
-        </if>
-        <if test="searchKeyWord != null and searchKeyWord != ''">
-            AND (lower(contract_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
-            OR lower(buyer) like lower(CONCAT('%',#{searchKeyWord},'%')))
-        </if>
-    </select>
-    <!-- 收款列表查询 -->
-    <select id="getListByCondition" parameterType="Map"
-            resultType="com.yh.saas.plugin.yiliangyiyun.entity.CollectionManagement">
-        SELECT
-        id,
-        contract_no as contractNo,
-        goods_name as goodsName,
-        buyer,
-        seller,
-        plan_id as planId,
-        collection_ing_payable as collectionIngPayable,
-        loan,
-        freight,
-        storage_fee as storageFee,
-        interest,
-        address_url as addressUrl,
-        collection_ed_payable as collectionEdPayable,
-        collection_not_payable as collectionNotPayable,
-        out_weight as outWeight,
-        status,
-        not_invoice as notInvoice,
-        already_invoice as alreadyInvoice,
-        update_date as updateDate
-        FROM collection_management
-        WHERE
-        comp_id = #{compId}
-        and delete_flag = '0'
-        <if test="searchType != null and searchType != ''">
-            <if test="searchType == 1">
-                AND status_flag = '1'
-            </if>
-            <if test="searchType == 2">
-                AND status_flag = '3'
-            </if>
-        </if>
-        <if test="searchKeyWord != null and searchKeyWord != ''">
-            AND (lower(contract_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
-            OR lower(buyer) like lower(CONCAT('%',#{searchKeyWord},'%')))
-        </if>
-        ORDER BY update_date DESC
-        <if test="currentPage != null and currentPage != ''">
-            LIMIT ${startRecord}, ${pageSize}
-        </if>
-    </select>
-</mapper>

winsea-haixin-plugin-wangluohuoyun/src/main/resources/mapper/CollectionWarehousingRecordMapper.xml

@@ -1,174 +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.CollectionWarehousingRecordMapper">
-    <!-- 获得销售出库统计总数 -->
-    <select id="getCountByCondition" parameterType="Map" resultType="java.lang.Integer">
-        SELECT
-        COUNT(id)
-        FROM collection_warehousing_record
-        WHERE
-        delete_flag = '0'
-        AND comp_id = #{compId}
-        <if test="searchType != null and searchType != ''">
-            <if test="searchType == 1">
-                AND amount_ed_payable = 0
-            </if>
-            <if test="searchType == 3">
-                AND amount_ed_payable >0
-            </if>
-            <if test="searchType == 4">
-                AND amount_ed_collectionable=0
-            </if>
-            <if test="searchType == 5">
-                AND amount_ed_collectionable>0
-            </if>
-            <if test="searchType == 6">
-                AND invoicing='0'
-            </if>
-            <if test="searchType == 7">
-                AND invoicing_sale='0'
-            </if>
-        </if>
-        <if test="contractNo != null and contractNo != ''and contractNo != '全部合同'">
-            AND contract_no = #{contractNo}
-        </if>
-        <if test="startDate != null">
-            AND (DATE_FORMAT(create_date,"%Y%m%d") &gt;=
-            DATE_FORMAT(#{startDate},"%Y%m%d"))
-        </if>
-        <if test="endDate != null">
-            AND (DATE_FORMAT(create_date,"%Y%m%d") &lt;=
-            DATE_FORMAT(#{endDate},"%Y%m%d"))
-        </if>
-        <if test="searchKeyWord != null and searchKeyWord != ''">
-            AND (lower(customer_name) like lower(CONCAT('%',#{searchKeyWord},'%'))
-            OR lower(car_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
-           )
-        </if>
-        <if test="businessKeys != null and businessKeys.size > 0">
-            and(
-            <foreach collection="businessKeys" item="businessValue" open="(" close=")" separator="or">
-                id = #{businessValue}
-            </foreach>
-            )
-        </if>
-        <if test="statusSet != null and statusSet.size > 0">
-            or (
-            <foreach collection="statusSet" item="statusId" separator="or" open="(" close=")">
-                status_flag =
-                <if test="statusId != null">
-                    #{statusId}
-                </if>
-            </foreach>
-            )
-        </if>
-    </select>
-    <!-- 获得销售出库统计列表 -->
-    <select id="getListByCondition" parameterType="Map"
-            resultType="com.yh.saas.plugin.yiliangyiyun.entity.CollectionWarehousingRecord">
-        SELECT
-        c.id,
-        c.comp_id as compId,
-        c.identity_id as identityId,
-        c.payment_no as paymentNo,
-        c.goods_name as goodsName,
-        c.car_no as carNo,
-        c.relation_id as relationId,
-        c.customer_number_card as customerNumberCard,
-        c.type,
-        c.in_date as inDate,
-        c.contract_no as contractNo,
-        c.net_weight as netWeight,
-        c.invoicing_sale as invoicingSale,
-        c.unit_deduction as unitDeduction,
-        c.unit_have as unithave,
-        c.amount_ing_payable as amountIngPayable,
-        c.amount_ed_payable as amountEdPayable,
-        c.amount_not_payable as amountNotPayable,
-        c.payment_screenshot as paymentScreenshot,
-        c.collection_screenshot as collectionScreenshot,
-        c.amount_ed_collectionable as amountEdCollectionable,
-        c.amount_not_collectable as amountNotCollectable,
-        c.customer_name as customerName,
-        c.customer_phone as customerPhone,
-        c.collection_date as collectionDate,
-        c.status,
-        c.picture_address as pictureAddress,
-        c.approve_status as approveStatus,
-        c.status_flag as statusFlag,
-        c.update_date as updateDate,
-        c.workflow_id as workflowId,
-        c.create_date as createDate,
-        c.invoicing,
-        c.grade,
-        (SELECT IFNULL(sum(case when p.type ='潮粮' then p.pure_weight else p.net_weight end),0)
-        FROM payment_management p
-        WHERE p.delete_flag = '0'
-        AND p.customer_number_card = c.customer_number_card
-        AND p.goods_name =c.goods_name
-        AND (DATE_FORMAT(p.create_date,"%Y%m%d") >=
-        DATE_FORMAT(#{year},"%Y%m%d"))
-        AND p.comp_id = c.comp_id) as num
-        FROM collection_warehousing_record c
-        WHERE
-        c.delete_flag = '0'
-        AND c.comp_id = #{compId}
-        <if test="searchType != null and searchType != ''">
-            <if test="searchType == 1">
-                AND c.amount_ed_payable = 0
-            </if>
-            <if test="searchType == 3">
-                AND c.amount_ed_payable >0
-            </if>
-            <if test="searchType == 4">
-                AND c.amount_ed_collectionable=0
-            </if>
-            <if test="searchType == 5">
-                AND c.amount_ed_collectionable>0
-            </if>
-            <if test="searchType == 6">
-                AND c.invoicing='0'
-            </if>
-            <if test="searchType == 7">
-                AND c.invoicing_sale='0'
-            </if>
-        </if>
-        <if test="contractNo != null and contractNo != ''and contractNo != '全部合同'">
-            AND c.contract_no = #{contractNo}
-        </if>
-        <if test="startDate != null">
-            AND (DATE_FORMAT(c.create_date,"%Y%m%d") &gt;=
-            DATE_FORMAT(#{startDate},"%Y%m%d"))
-        </if>
-        <if test="endDate != null">
-            AND (DATE_FORMAT(c.create_date,"%Y%m%d") &lt;=
-            DATE_FORMAT(#{endDate},"%Y%m%d"))
-        </if>
-        <if test="searchKeyWord != null and searchKeyWord != ''">
-            AND (lower(c.customer_name) like lower(CONCAT('%',#{searchKeyWord},'%'))
-            OR lower(c.car_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
-            )
-        </if>
-        <if test="businessKeys != null and businessKeys.size > 0">
-            and(
-            <foreach collection="businessKeys" item="businessValue" open="(" close=")" separator="or">
-                c.id = #{businessValue}
-            </foreach>
-            )
-        </if>
-        <if test="statusSet != null and statusSet.size > 0">
-            or (
-            <foreach collection="statusSet" item="statusId" separator="or" open="(" close=")">
-                c.status_flag =
-                <if test="statusId != null">
-                    #{statusId}
-                </if>
-            </foreach>
-            )
-        </if>
-        ORDER BY c.update_date DESC
-        <if test="currentPage != null and currentPage != ''">
-            LIMIT ${startRecord}, ${pageSize}
-        </if>
-    </select>
-</mapper>

winsea-haixin-plugin-wangluohuoyun/src/main/resources/mapper/CommonCompanyIdentityMapper.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.CommonCompanyIdentityMapper">
-
-</mapper>

winsea-haixin-plugin-wangluohuoyun/src/main/resources/mapper/CommonConstantFalseMapper.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.CommonConstantFalseMapper">
-
-</mapper>