Parcourir la source

取消借款用途值

lamphua il y a 10 mois
Parent
révision
f516faac4a

+ 0
- 4
oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcBorrowController.java Voir le fichier

80
     public AjaxResult add(@RequestBody CmcBorrow cmcBorrow)
80
     public AjaxResult add(@RequestBody CmcBorrow cmcBorrow)
81
     {
81
     {
82
         cmcBorrow.setApplyDept(getLoginUser().getDeptId());
82
         cmcBorrow.setApplyDept(getLoginUser().getDeptId());
83
-        if (cmcBorrow.getProjectId() != null) {
84
-            CmcProject cmcProject = cmcProjectService.selectCmcProjectByProjectId(cmcBorrow.getProjectId());
85
-            cmcBorrow.setBorrowUsage(cmcProject.getProjectNumber() + "-" + cmcProject.getProjectName());
86
-        }
87
         return toAjax(cmcBorrowService.insertCmcBorrow(cmcBorrow));
83
         return toAjax(cmcBorrowService.insertCmcBorrow(cmcBorrow));
88
     }
84
     }
89
 
85
 

+ 10
- 10
oa-back/ruoyi-system/src/main/resources/mapper/flowable/FlowDeployMapper.xml Voir le fichier

31
 
31
 
32
         SELECT
32
         SELECT
33
             rp.id_ as id,
33
             rp.id_ as id,
34
-            rp.deployment_id_ as deploymentId,
35
-            rd.name_ as name,
36
-            rd.category_ as category,
37
-            rp.key_ as flowKey,
38
-            rp.version_ as version,
39
-            rp.suspension_state_ as suspensionState,
40
-            rd.deploy_time_  as deploymentTime
34
+            rp.DEPLOYMENT_ID_ as deploymentId,
35
+            rd.NAME_ as name,
36
+            rd.CATEGORY_ as category,
37
+            rp.KEY_ as flowKey,
38
+            rp.VERSION_ as version,
39
+            rp.SUSPENSION_STATE_ as suspensionState,
40
+            rd.DEPLOY_TIME_  as deploymentTime
41
         FROM
41
         FROM
42
             ACT_RE_PROCDEF rp
42
             ACT_RE_PROCDEF rp
43
-                LEFT JOIN ACT_RE_DEPLOYMENT rd ON rp.deployment_id_ = rd.id_
44
-        where rd.id_ = #{param}
45
-        order by rd.id_ asc
43
+                LEFT JOIN ACT_RE_DEPLOYMENT rd ON rp.DEPLOYMENT_ID_ = rd.ID_
44
+        where rd.ID_ = #{param}
45
+        order by rd.ID_ asc
46
     </select>
46
     </select>
47
 
47
 
48
 
48
 

Loading…
Annuler
Enregistrer