Browse Source

采购合同备案程序上传

张庆宇 14 hours ago
parent
commit
d85fa5230a

+ 8
- 99
src/main/java/com/example/backend/entity/common/CommonRespCenter.java View File

18
 @TableName(value = "respCenter")
18
 @TableName(value = "respCenter")
19
 public class CommonRespCenter {
19
 public class CommonRespCenter {
20
 
20
 
21
-    @TableField("respCtrCode")
22
-    private String respCtrCode;
23
-
24
-    @TableField("respCtrName")
25
-    private String respCtrName;
26
-
27
-    @TableId(value = "id", type = IdType.ASSIGN_ID)
28
-    private Long id;
29
-
30
-    @TableField("process_instance_id")
31
-    private String processInstanceId;
21
+    @TableField("id")
22
+    private String id;
32
 
23
 
33
     @TableField("fno")
24
     @TableField("fno")
34
     private String fno;
25
     private String fno;
35
 
26
 
36
-    @TableField("fdate")
37
-    private Date fdate;
38
-
39
-    @TableField("placed")
40
-    private String placed;
41
-
42
-    @TableField("fmodalid")
43
-    private Long fmodalid;
44
-
45
-    @TableField("sourceid")
46
-    private Long sourceid;
47
-
48
-    @TableField("sourcetable")
49
-    private String sourcetable;
50
-
51
-    @TableField("img_ids")
52
-    private String imgIds;
53
-
54
-    @TableField("inc")
55
-    private Integer inc;
56
-
57
-    @TableField("rid")
58
-    private Long rid;
59
-
60
-    @TableField("fsaved")
61
-    private String fsaved;
62
-
63
-    @TableField("remark")
64
-    private String remark;
65
-
66
-    @TableField("sys_template_name")
67
-    private String sysTemplateName;
68
-
69
-    @TableField("del_flag")
70
-    private Integer delFlag;
71
-
72
-    @TableField("create_by")
73
-    private String createBy;
74
-
75
-    @TableField("create_time")
76
-    private Date createTime;
77
-
78
-    @TableField("create_by_name")
79
-    private String createByName;
80
-
81
-    @TableField("update_by")
82
-    private String updateBy;
83
-
84
-    @TableField("update_time")
85
-    private Date updateTime;
86
-
87
-    @TableField("update_by_name")
88
-    private String updateByName;
89
-
90
-    @TableField("dept_name")
91
-    private String deptName;
92
-
93
-    @TableField("dept_id")
94
-    private String deptId;
95
-
96
-    @TableField("submissionDate")
97
-    private Date submissionDate;
98
-
99
-    @TableField("appEffectiveDate")
100
-    private Date appEffectiveDate;
101
-
102
-    @TableField("rptg")
103
-    private String rptg;
104
-
105
-    @TableField("fours")
106
-    private String fours;
107
-
108
-    @TableField("foursname")
109
-    private String foursname;
110
-
111
-    @TableField("BcCode")
112
-    private String bcCode;
113
-
114
-    @TableField("accountingAttribution")
115
-    private String accountingAttribution;
116
-
117
-    @TableField("BcDeptId")
118
-    private String bcDeptId;
119
-
120
-    @TableField("BcDeptName")
121
-    private String bcDeptName;
27
+    @TableField("cpny")
28
+    private String cpny;
122
 
29
 
123
-    private static final long serialVersionUID = 1L;
30
+    @TableField("deptname")
31
+    private String deptname;
124
 
32
 
125
-    // getter和setter方法省略...
33
+    @TableField("deptcode")
34
+    private String deptcode;
126
 }
35
 }

+ 0
- 3
src/main/java/com/example/backend/entity/pccontract/PCcontractRCenterDtl.java View File

63
     private String deptId;
63
     private String deptId;
64
 
64
 
65
     //补充字段信息
65
     //补充字段信息
66
-    @TableField("del_flag")
67
-    private String delFlag;
68
-
69
     @TableField("create_by")
66
     @TableField("create_by")
70
     private String createBy;
67
     private String createBy;
71
 
68
 

+ 14
- 9
src/main/java/com/example/backend/service/contract/impl/PurchaseContractServiceImpl.java View File

583
         contract.setTransMode(mainItem.getTranWay());
583
         contract.setTransMode(mainItem.getTranWay());
584
         contract.setQtyOverflow(mainItem.getQtyOver());
584
         contract.setQtyOverflow(mainItem.getQtyOver());
585
         contract.setQtyShortage(mainItem.getQtyShort());
585
         contract.setQtyShortage(mainItem.getQtyShort());
586
+        contract.setAmtShortage(mainItem.getAmtShort());
587
+        contract.setAmtOverflow(mainItem.getAmtOver());
586
         contract.setIfSunPurchase("是");
588
         contract.setIfSunPurchase("是");
587
         contract.setIfBidding("否");
589
         contract.setIfBidding("否");
588
 
590
 
636
                 PCcontractRCenterDtl rcent = new PCcontractRCenterDtl();
638
                 PCcontractRCenterDtl rcent = new PCcontractRCenterDtl();
637
                 rcent.setPono(mainItem.getPono());
639
                 rcent.setPono(mainItem.getPono());
638
                 rcent.setCreateBy(rcentDto.getCreate_by());
640
                 rcent.setCreateBy(rcentDto.getCreate_by());
639
-                List<CommonRespCenter> RClist = commonRespCenterMapper.selectByUserCode(rcentDto.getCreate_by());
640
-                if (RClist != null && !RClist.isEmpty()) {
641
-                    rcent.setRespCtrCode(RClist.get(0).getRespCtrCode());
642
-                    rcent.setRespCtrName(RClist.get(0).getRespCtrName());
641
+                List<CommonRespCenter> rClist = commonRespCenterMapper.selectByUserCode(rcentDto.getCreate_by());
642
+                if (rClist != null && !rClist.isEmpty()) {
643
+                    rcent.setInstitutionId(rClist.get(0).getFno());
644
+                    rcent.setInstitutionNm(rClist.get(0).getCpny());
645
+                    rcent.setPersonDeptNm(rClist.get(0).getDeptname());
646
+                    rcent.setPersonDeptId(rClist.get(0).getDeptcode());
643
                 }
647
                 }
644
                 rcent.setAssessQtyRate(rcentDto.getAssessQtyRate());
648
                 rcent.setAssessQtyRate(rcentDto.getAssessQtyRate());
645
                 rcent.setAssessRatio(rcentDto.getAssessRatio());
649
                 rcent.setAssessRatio(rcentDto.getAssessRatio());
646
-                rcent.setDelFlag("0");
647
                 pCcontractRCenterDtls.add(rcent);
650
                 pCcontractRCenterDtls.add(rcent);
648
             }
651
             }
649
         }else {
652
         }else {
650
             PCcontractRCenterDtl rcent = new PCcontractRCenterDtl();
653
             PCcontractRCenterDtl rcent = new PCcontractRCenterDtl();
651
             rcent.setPono(mainItem.getPono());
654
             rcent.setPono(mainItem.getPono());
652
             rcent.setCreateBy(mainItem.getCreate_by());
655
             rcent.setCreateBy(mainItem.getCreate_by());
653
-            List<CommonRespCenter> RClist = commonRespCenterMapper.selectByUserCode(mainItem.getCreate_by());
654
-            if (RClist != null && !RClist.isEmpty()) {
655
-                rcent.setRespCtrCode(RClist.get(0).getRespCtrCode());
656
-                rcent.setRespCtrName(RClist.get(0).getRespCtrName());
656
+            List<CommonRespCenter> rClist = commonRespCenterMapper.selectByUserCode(mainItem.getCreate_by());
657
+            if (rClist != null && !rClist.isEmpty()) {
658
+                rcent.setInstitutionId(rClist.get(0).getFno());
659
+                rcent.setInstitutionNm(rClist.get(0).getCpny());
660
+                rcent.setPersonDeptNm(rClist.get(0).getDeptname());
661
+                rcent.setPersonDeptId(rClist.get(0).getDeptcode());
657
             }
662
             }
658
             rcent.setAssessQtyRate(new BigDecimal(100));
663
             rcent.setAssessQtyRate(new BigDecimal(100));
659
             rcent.setAssessRatio(new BigDecimal(100));
664
             rcent.setAssessRatio(new BigDecimal(100));

+ 16
- 7
src/main/resources/mapper/CommonRespCenterMapper.xml View File

4
 
4
 
5
 
5
 
6
     <select id="selectByUserCode" resultType="com.example.backend.entity.common.CommonRespCenter">
6
     <select id="selectByUserCode" resultType="com.example.backend.entity.common.CommonRespCenter">
7
-        select *
8
-        from SGGMIIP.respCenter rc
9
-        where ifnull(rc.del_flag, 0) != 1
10
-        AND rc.respCtrCode IN (SELECT sd.OA_ORG_CODE
11
-        FROM SGGMIIP.SYS_USER su ,SGGMIIP.SYS_USER_DEPARTMENT sud ,SGGMIIP.SYS_DEPARTMENT sd
12
-        WHERE su.id = sud.USER_ID AND sud.DEPT_ID  = sd.ID
13
-        AND su.USER_CODE =#{userCode})
7
+        SELECT
8
+            t.fno,
9
+            t.cpny,
10
+            t.deptname,
11
+            t.deptcode
12
+        FROM (
13
+                 SELECT DISTINCT
14
+                     c.fno,
15
+                     c.cpny,
16
+                     a.deptname,
17
+                     a.deptcode
18
+                 FROM View_Dept_Code a
19
+                          LEFT JOIN View_User_Code b ON a.deptid = b.dept_id
20
+                          LEFT JOIN addrctrl c ON a.fourscode = c.hrDeptCode
21
+                 WHERE b.user_code = #{userCode}
22
+             ) t ;
14
     </select>
23
     </select>
15
 
24
 
16
 </mapper>
25
 </mapper>

Loading…
Cancel
Save