项目费用申请-编辑改bug

ruoyi-psa/src/main/java/com/ruoyi/controller/ApprovalConfigurationController.java

@@ -66,7 +66,6 @@ public class ApprovalConfigurationController extends BaseController {
     @Anonymous
     @GetMapping ("/getNodeList/{id}")
     public AjaxResult getNodeList(@PathVariable Integer id){
-
         return AjaxResult.success(approvalConfigurationService.getNodeList(id));
     }
 }

ruoyi-psa/src/main/java/com/ruoyi/domain/dto/FyglProjectCostDTO.java

@@ -15,7 +15,6 @@ public class FyglProjectCostDTO extends BaseEntity {
     private String userName;
     private String projectStatus;
     private Integer approveStatus;
-    private String  waterNumber;
     private String costType;
     private String timeOfExpense;
     private Double sumMoney;

ruoyi-psa/src/main/java/com/ruoyi/service/impl/IFyglProjectCostServiceImpl.java

@@ -50,9 +50,7 @@ public class IFyglProjectCostServiceImpl implements IFyglProjectCostService {
     //插入方法
     @Override
     public int insertProjectCost(FyglProjectCostDTO fyglProjectCostDTO) {
-        //获取流水号
-        String s = serialNumberGenerator.generateSerialNumber("xmfy");
-        fyglProjectCostDTO.setWaterNumber(s);
+
         fyglProjectCostDTO.setCreateBy(SecurityUtils.getUsername());
         Date nowDate = DateUtils.getNowDate();
         fyglProjectCostDTO.setCreateTime(nowDate);

ruoyi-psa/src/main/resources/mapper/projectCost/FyglProjectCostMapper.xml

@@ -11,7 +11,6 @@
         <result property="projectType"    column="project_type"    />
         <result property="userName"    column="user_name"    />
         <result property="projectStatus"    column="project_status"    />
-        <result property="waterNumber"    column="water_number"    />
 
         <result property="projectId"    column="project_id"    />
         <result property="timeOfExpense"    column="time_of_expense"    />
@@ -41,7 +40,6 @@
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="projectId != null">project_id,</if>
             <if test="approveStatus != null">approve_status,</if>
-            <if test="waterNumber != null">water_number,</if>
             <if test="costType != null">cost_type,</if>
             <if test="timeOfExpense != null">time_of_expense,</if>
             <if test="description != null">`description`,</if>
@@ -58,7 +56,6 @@
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="projectId != null">#{projectId},</if>
             <if test="approveStatus != null">#{approveStatus},</if>
-            <if test="waterNumber != null">#{waterNumber},</if>
             <if test="costType != null">#{costType},</if>
             <if test="timeOfExpense != null">#{timeOfExpense},</if>
             <if test="description != null">#{description},</if>
@@ -79,7 +76,6 @@
         <trim prefix="SET" suffixOverrides=",">
             <if test="projectId != null">project_id = #{projectId},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
-            <if test="waterNumber != null">water_nqumber = #{waterNumber},</if>
             <if test="costType != null">cost_type = #{costType},</if>
             <if test="timeOfExpense != null">time_of_expense = #{timeOfExpense},</if>
             <if test="description != null">`description` = #{description},</if>
@@ -101,7 +97,6 @@
             p.project_type,
             u.user_name,
             p.project_status,
-            fp.water_number,
             fp.time_of_expense,
             fp.cost_type,
             fp.sum_money,
@@ -140,7 +135,6 @@
             fp.unit_price,
             fp.amount,
             fp.sum_money,
-            fp.water_number,
             fp.create_time,
             fp.create_by,
             fp.update_time,