Procházet zdrojové kódy

Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb

hejinbo před 2 roky
rodič
revize
3262548b25

+ 10
- 0
ruoyi-common/src/main/java/com/ruoyi/common/utils/bean/SealSignRecord.java Zobrazit soubor

23
     private String orgnizeNamePsnAccount;
23
     private String orgnizeNamePsnAccount;
24
     /** 机构经办人名称 */
24
     /** 机构经办人名称 */
25
     private String orgnizeNamepsnName;
25
     private String orgnizeNamepsnName;
26
+    /** 流程状态 */
27
+    private Integer signFlowStatus;
28
+
29
+    public Integer getSignFlowStatus() {
30
+        return signFlowStatus;
31
+    }
32
+
33
+    public void setSignFlowStatus(Integer signFlowStatus) {
34
+        this.signFlowStatus = signFlowStatus;
35
+    }
26
 
36
 
27
     public String getFileid() {
37
     public String getFileid() {
28
         return fileid;
38
         return fileid;

+ 1
- 1
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java Zobrazit soubor

96
                 caseAffiliate.setCaseAppliId(caseApplication.getId());
96
                 caseAffiliate.setCaseAppliId(caseApplication.getId());
97
                 if(caseAffiliate.getIdentityType()==1&&StrUtil.isNotEmpty(caseAffiliate.getName())) {
97
                 if(caseAffiliate.getIdentityType()==1&&StrUtil.isNotEmpty(caseAffiliate.getName())) {
98
                     // 将组织机构id设为申请人名称
98
                     // 将组织机构id设为申请人名称
99
-                    if (deptMap.containsKey(caseApplication.getName())) {
99
+                    if (deptMap.containsKey(caseAffiliate.getName())) {
100
                         caseAffiliate.setName(String.valueOf(deptMap.get(caseAffiliate.getName())));
100
                         caseAffiliate.setName(String.valueOf(deptMap.get(caseAffiliate.getName())));
101
                     } else {
101
                     } else {
102
                         // 如果不存在则新增
102
                         // 如果不存在则新增