Merge remote-tracking branch 'origin/master'

src/main/java/com/example/backend/entity/common/CommonRespCenter.java

@@ -0,0 +1,35 @@
+package com.example.backend.entity.common;
+
+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 lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author
+ * @TableName respCenter
+ */
+
+@Data
+@TableName(value = "respCenter")
+public class CommonRespCenter {
+
+    @TableField("id")
+    private String id;
+
+    @TableField("fno")
+    private String fno;
+
+    @TableField("cpny")
+    private String cpny;
+
+    @TableField("deptname")
+    private String deptname;
+
+    @TableField("deptcode")
+    private String deptcode;
+}

src/main/java/com/example/backend/entity/common/SysUser.java

@@ -291,9 +291,6 @@ public class SysUser {
     @TableField(exist = false)
     private String fours;
 
-    @TableField(exist = false)
-    private String deptname;
-
     @TableField(exist = false)
     private String ctrylmbAddr;
 

src/main/java/com/example/backend/entity/pccontract/PCcontractRCenterDtl.java

@@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.example.backend.entity.common.BaseModelPur;
 import lombok.Data;
 
+
 import java.math.BigDecimal;
+import java.util.Date;
 
 @Data
 @TableName("SGGMIIP.rCenterDtl")
@@ -17,9 +19,6 @@ public class PCcontractRCenterDtl extends BaseModelPur {
     @TableField(exist = false)
     private String pono;
 
-    @TableField("fchno")
-    private int fchno;
-
     @TableField("respCtrCode")
     private String respCtrCode;
 
@@ -62,4 +61,44 @@ public class PCcontractRCenterDtl extends BaseModelPur {
 
     @TableField("dept_id")
     private String deptId;
+
+    //补充字段信息
+    @TableField("create_by")
+    private String createBy;
+
+    @TableField("create_time")
+    private Date createTime;
+
+    @TableField("create_by_name")
+    private String createByName;
+
+    @TableField("update_by")
+    private String updateBy;
+
+    @TableField("update_time")
+    private Date updateTime;
+
+    @TableField("update_by_name")
+    private String updateByName;
+
+    @TableField("curChangeVer")
+    private String curChangeVer;
+
+    @TableField("personid")
+    private String personid;
+
+    @TableField("personname")
+    private String personname;
+
+    @TableField("personDeptId")
+    private String personDeptId;
+
+    @TableField("personDeptNm")
+    private String personDeptNm;
+
+    @TableField("InstitutionId")
+    private String InstitutionId;
+
+    @TableField("InstitutionNm")
+    private String InstitutionNm;
 }

src/main/java/com/example/backend/mapper/common/CommonRespCenterMapper.java

@@ -0,0 +1,14 @@
+package com.example.backend.mapper.common;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.example.backend.entity.common.CommonRespCenter;
+import com.example.backend.entity.common.ContractErrorMsg;
+import com.example.backend.entity.common.SysUser;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface CommonRespCenterMapper extends BaseMapper<CommonRespCenter> {
+
+    List<CommonRespCenter> selectByUserCode(@Param("userCode") String userCode);
+}

src/main/java/com/example/backend/service/contract/impl/PurchaseContractServiceImpl.java

@@ -1,11 +1,9 @@
 package com.example.backend.service.contract.impl;
 
-import com.example.backend.entity.common.ContractErrorMsg;
-import com.example.backend.entity.common.CustCtrl;
-import com.example.backend.entity.common.DataDict;
-import com.example.backend.entity.common.SysUser;
+import com.example.backend.entity.common.*;
 import com.example.backend.entity.pccontract.*;
 import com.example.backend.excel.PcContract.*;
+import com.example.backend.mapper.common.CommonRespCenterMapper;
 import com.example.backend.mapper.common.ContractErrorMsgMapper;
 import com.example.backend.mapper.common.DataDictMapper;
 import com.example.backend.mapper.contract.CustCtrlMapper;
@@ -51,6 +49,9 @@ public class PurchaseContractServiceImpl implements PurchaseContractService {
     @Autowired
     private SysUserMapper sysUserMapper;
 
+    @Autowired
+    private CommonRespCenterMapper commonRespCenterMapper;
+
     // 存储通过校验的合同数据
     private List<PurchaseContract> purchaseContracts = new ArrayList<>();
     private List<PCcontractDtl> pCcontractDtls = new ArrayList<>();
@@ -582,6 +583,8 @@ public class PurchaseContractServiceImpl implements PurchaseContractService {
         contract.setTransMode(mainItem.getTranWay());
         contract.setQtyOverflow(mainItem.getQtyOver());
         contract.setQtyShortage(mainItem.getQtyShort());
+        contract.setAmtShortage(mainItem.getAmtShort());
+        contract.setAmtOverflow(mainItem.getAmtOver());
         contract.setIfSunPurchase("是");
         contract.setIfBidding("否");
 
@@ -635,11 +638,12 @@ public class PurchaseContractServiceImpl implements PurchaseContractService {
                 PCcontractRCenterDtl rcent = new PCcontractRCenterDtl();
                 rcent.setPono(mainItem.getPono());
                 rcent.setCreateBy(rcentDto.getCreate_by());
-                List<SysUser> createByList = sysUserMapper.selectByCreateBy(rcentDto.getCreate_by());
-                if (createByList != null && !createByList.isEmpty()) {
-                    rcent.setDeptId(createByList.get(0).getDeptCode());
-                    rcent.setDeptName(createByList.get(0).getDeptName());
-                    rcent.setCreateByName(createByList.get(0).getUserDesc());
+                List<CommonRespCenter> rClist = commonRespCenterMapper.selectByUserCode(rcentDto.getCreate_by());
+                if (rClist != null && !rClist.isEmpty()) {
+                    rcent.setInstitutionId(rClist.get(0).getFno());
+                    rcent.setInstitutionNm(rClist.get(0).getCpny());
+                    rcent.setPersonDeptNm(rClist.get(0).getDeptname());
+                    rcent.setPersonDeptId(rClist.get(0).getDeptcode());
                 }
                 rcent.setAssessQtyRate(rcentDto.getAssessQtyRate());
                 rcent.setAssessRatio(rcentDto.getAssessRatio());
@@ -649,11 +653,12 @@ public class PurchaseContractServiceImpl implements PurchaseContractService {
             PCcontractRCenterDtl rcent = new PCcontractRCenterDtl();
             rcent.setPono(mainItem.getPono());
             rcent.setCreateBy(mainItem.getCreate_by());
-            List<SysUser> createByList = sysUserMapper.selectByCreateBy(mainItem.getCreate_by());
-            if (createByList != null && !createByList.isEmpty()) {
-                rcent.setDeptId(createByList.get(0).getDeptCode());
-                rcent.setDeptName(createByList.get(0).getDeptName());
-                rcent.setCreateByName(createByList.get(0).getUserDesc());
+            List<CommonRespCenter> rClist = commonRespCenterMapper.selectByUserCode(mainItem.getCreate_by());
+            if (rClist != null && !rClist.isEmpty()) {
+                rcent.setInstitutionId(rClist.get(0).getFno());
+                rcent.setInstitutionNm(rClist.get(0).getCpny());
+                rcent.setPersonDeptNm(rClist.get(0).getDeptname());
+                rcent.setPersonDeptId(rClist.get(0).getDeptcode());
             }
             rcent.setAssessQtyRate(new BigDecimal(100));
             rcent.setAssessRatio(new BigDecimal(100));

src/main/resources/mapper/CommonRespCenterMapper.xml

@@ -0,0 +1,25 @@
+<?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.example.backend.mapper.common.CommonRespCenterMapper">
+
+
+    <select id="selectByUserCode" resultType="com.example.backend.entity.common.CommonRespCenter">
+        SELECT
+            t.fno,
+            t.cpny,
+            t.deptname,
+            t.deptcode
+        FROM (
+                 SELECT DISTINCT
+                     c.fno,
+                     c.cpny,
+                     a.deptname,
+                     a.deptcode
+                 FROM View_Dept_Code a
+                          LEFT JOIN View_User_Code b ON a.deptid = b.dept_id
+                          LEFT JOIN addrctrl c ON a.fourscode = c.hrDeptCode
+                 WHERE b.user_code = #{userCode}
+             ) t ;
+    </select>
+
+</mapper>

src/main/resources/mapper/SysUserMapper.xml

@@ -68,7 +68,7 @@
         order by a.fno
     </select>
     <select id="selectByCreateBy" resultType="com.example.backend.entity.common.SysUser">
-        select a.id,a.dept_code as deptCode, a.DEPT_NAME,c.user_desc,c.USER_CODE
+        select a.id,a.dept_code as deptCode, a.DEPT_NAME as deptName,c.user_desc,c.USER_CODE
         from SGGMIIP.SYS_DEPARTMENT a
                  join SGGMIIP.SYS_USER_DEPARTMENT b on a.id = b.DEPT_ID
                  join SGGMIIP.SYS_USER c on b.USER_ID = c.id