费用承担方字段增加

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java

@@ -218,6 +218,7 @@ public class TmTaskController extends BaseController {
                         leaseApplyInfo.setType("2"); // 设置审批层级，先固定2层，后期根据接口传入Type区分来源设定
                         leaseApplyInfo.setLeaseType(task.getLeaseType());
                         leaseApplyInfo.setEstimateLeaseTime(task.getEstimateLeaseTime());
+                        leaseApplyInfo.setCostBearingParty(task.getCostBearingParty());
 
                         // 创建领料任务，返回领料任务编号
                         boolean addLeaseTaskResult = leaseApplyInfoService.genderLeaseCode(leaseApplyInfo) > 0;

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyInfo.java

@@ -53,6 +53,11 @@ public class LeaseApplyInfo implements Serializable {
      */
     @ApiModelProperty(value = "联系方式")
     private String phone;
+    /**
+     * 费用承担方
+     */
+    @ApiModelProperty(value = "费用承担方")
+    private String costBearingParty;
 
     /**
      * 1：1级审批，2：2级审批

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java

@@ -67,6 +67,11 @@ public class TmTask implements Serializable {
     @ApiModelProperty(value = "库存")
     private Double num;
 
+    /**
+     * 费用承担方
+     */
+    @ApiModelProperty(value = "费用承担方")
+    private String costBearingParty;
     /**
      * 编号
      */

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/SysDicController.java

@@ -107,9 +107,9 @@ public class SysDicController extends BaseController
      */
     @ApiOperation(value = "获取费用承担方列表")
     @GetMapping(value = "/pid")
-    public AjaxResult getBear(Long pid)
+    public AjaxResult getBear()
     {
-        List<String> bear = sysDicService.getBear(pid);
+        List<String> bear = sysDicService.getBear();
         return success(bear);
     }
 

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/SysDicMapper.java

@@ -84,5 +84,5 @@ public interface SysDicMapper
      */
     SysDic selectByName(String name);
 
-    List<String> getBear(Long pid);
+    List<String> getBear();
 }

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/ISysDicService.java

@@ -81,5 +81,5 @@ public interface ISysDicService
      */
     public int deleteSysDicById(Long id);
 
-    List<String> getBear(Long pid);
+    List<String> getBear();
 }

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/SysDicServiceImpl.java

@@ -138,8 +138,8 @@ public class SysDicServiceImpl implements ISysDicService
     }
 
     @Override
-    public List<String> getBear(Long pid) {
+    public List<String> getBear() {
-        return sysDicMapper.getBear(pid);
+        return sysDicMapper.getBear();
     }
 
 }

sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseApplyInfoMapper.xml

@@ -137,6 +137,9 @@
       <if test="estimateLeaseTime != null">
         estimate_lease_time,
       </if>
+      <if test="costBearingParty != null and costBearingParty != ''">
+        cost_bearing_party,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="code != null">
@@ -196,6 +199,9 @@
       <if test="estimateLeaseTime != null">
         #{estimateLeaseTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="costBearingParty != null and costBearingParty != ''">
+        #{costBearingParty,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
 

sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml

@@ -642,7 +642,7 @@
         tt.*, su.phonenumber AS phoneNumber, sd.dept_name as deptName,
         bpi.lot_id as proId,   bpi.pro_id as  projectId,bpi.lot_name as proName,
         bui.unit_id as unitId,bui.unit_name as unitName,
-        tt.create_by as applyFor,d.`name` as taskName,
+        tt.create_by as applyFor,d.`name` as taskName,lai.cost_bearing_party as costBearingParty,lai.cost_bearing_party as costBearingParty,
 
         su2.user_name as companyAuditBy,
         lai.company_audit_time as companyAuditTime,