采购合同备案程序上传

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

@@ -18,109 +18,18 @@ import java.util.Date;
 @TableName(value = "respCenter")
 public class CommonRespCenter {
 
-    @TableField("respCtrCode")
-    private String respCtrCode;
-
-    @TableField("respCtrName")
-    private String respCtrName;
-
-    @TableId(value = "id", type = IdType.ASSIGN_ID)
-    private Long id;
-
-    @TableField("process_instance_id")
-    private String processInstanceId;
+    @TableField("id")
+    private String id;
 
     @TableField("fno")
     private String fno;
 
-    @TableField("fdate")
-    private Date fdate;
-
-    @TableField("placed")
-    private String placed;
-
-    @TableField("fmodalid")
-    private Long fmodalid;
-
-    @TableField("sourceid")
-    private Long sourceid;
-
-    @TableField("sourcetable")
-    private String sourcetable;
-
-    @TableField("img_ids")
-    private String imgIds;
-
-    @TableField("inc")
-    private Integer inc;
-
-    @TableField("rid")
-    private Long rid;
-
-    @TableField("fsaved")
-    private String fsaved;
-
-    @TableField("remark")
-    private String remark;
-
-    @TableField("sys_template_name")
-    private String sysTemplateName;
-
-    @TableField("del_flag")
-    private Integer delFlag;
-
-    @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("dept_name")
-    private String deptName;
-
-    @TableField("dept_id")
-    private String deptId;
-
-    @TableField("submissionDate")
-    private Date submissionDate;
-
-    @TableField("appEffectiveDate")
-    private Date appEffectiveDate;
-
-    @TableField("rptg")
-    private String rptg;
-
-    @TableField("fours")
-    private String fours;
-
-    @TableField("foursname")
-    private String foursname;
-
-    @TableField("BcCode")
-    private String bcCode;
-
-    @TableField("accountingAttribution")
-    private String accountingAttribution;
-
-    @TableField("BcDeptId")
-    private String bcDeptId;
-
-    @TableField("BcDeptName")
-    private String bcDeptName;
+    @TableField("cpny")
+    private String cpny;
 
-    private static final long serialVersionUID = 1L;
+    @TableField("deptname")
+    private String deptname;
 
-    // getter和setter方法省略...
+    @TableField("deptcode")
+    private String deptcode;
 }

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

@@ -63,9 +63,6 @@ public class PCcontractRCenterDtl extends BaseModelPur {
     private String deptId;
 
     //补充字段信息
-    @TableField("del_flag")
-    private String delFlag;
-
     @TableField("create_by")
     private String createBy;
 

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

@@ -583,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("否");
 
@@ -636,24 +638,27 @@ public class PurchaseContractServiceImpl implements PurchaseContractService {
                 PCcontractRCenterDtl rcent = new PCcontractRCenterDtl();
                 rcent.setPono(mainItem.getPono());
                 rcent.setCreateBy(rcentDto.getCreate_by());
-                List<CommonRespCenter> RClist = commonRespCenterMapper.selectByUserCode(rcentDto.getCreate_by());
-                if (RClist != null && !RClist.isEmpty()) {
-                    rcent.setRespCtrCode(RClist.get(0).getRespCtrCode());
-                    rcent.setRespCtrName(RClist.get(0).getRespCtrName());
+                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());
-                rcent.setDelFlag("0");
                 pCcontractRCenterDtls.add(rcent);
             }
         }else {
             PCcontractRCenterDtl rcent = new PCcontractRCenterDtl();
             rcent.setPono(mainItem.getPono());
             rcent.setCreateBy(mainItem.getCreate_by());
-            List<CommonRespCenter> RClist = commonRespCenterMapper.selectByUserCode(mainItem.getCreate_by());
-            if (RClist != null && !RClist.isEmpty()) {
-                rcent.setRespCtrCode(RClist.get(0).getRespCtrCode());
-                rcent.setRespCtrName(RClist.get(0).getRespCtrName());
+            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

@@ -4,13 +4,22 @@
 
 
     <select id="selectByUserCode" resultType="com.example.backend.entity.common.CommonRespCenter">
-        select *
-        from SGGMIIP.respCenter rc
-        where ifnull(rc.del_flag, 0) != 1
-        AND rc.respCtrCode IN (SELECT sd.OA_ORG_CODE
-        FROM SGGMIIP.SYS_USER su ,SGGMIIP.SYS_USER_DEPARTMENT sud ,SGGMIIP.SYS_DEPARTMENT sd
-        WHERE su.id = sud.USER_ID AND sud.DEPT_ID  = sd.ID
-        AND su.USER_CODE =#{userCode})
+        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>