费用来源对应关系

ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActClassificationController.java

@@ -33,15 +33,15 @@ public class ActClassificationController extends BaseController
      * 查询上级分类
      * */
     @PreAuthorize("@ss.hasPermi('ActClassification:ActClassification:savepid')")
-    @GetMapping("/savepid")
+    @GetMapping("/savepid/{sskId}")
     @ResponseBody
-    public TableDataInfo saveSid(){
-
-        List<ActClassification> options = actClassificationService.savePid();
+    public TableDataInfo saveSid(@PathVariable("sskId") Long sskId){
 
+        List<ActClassification> options = actClassificationService.savePid(sskId);
         return getDataTable(options);
 
     }
+
     /**
      * 查询分配信息列表
      */
@@ -117,7 +117,6 @@ public class ActClassificationController extends BaseController
     @PutMapping("/{id}/enable")
     public AjaxResult setEnable(@PathVariable("id") Long id, @RequestParam("status") Integer status)
     {
-
         actClassificationService.setEnable(id,status);
         if (status < 0){
             return AjaxResult.error(ServiceCode.ERR_CODE+"","启用失败");
@@ -164,4 +163,11 @@ public class ActClassificationController extends BaseController
     public List<ActClassification> getSubActClassifications(@PathVariable("parentId") int parentId) {
         return actClassificationService.getSubActClassifications(parentId);
     }
+
+    @PreAuthorize("@ss.hasPermission('ActClassification:ActClassification:SunDy')")
+    @GetMapping("/SunDy/{sskId}")
+    public List<ActClassification> getSubActClassDy(@PathVariable("sskId") int sskId) {
+        return actClassificationService.getSubActClassDy(sskId);
+    }
+
 }

ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActClassification.java

@@ -22,18 +22,29 @@ public class ActClassification extends BaseEntity
     @Excel(name = "名称")
     private String name;
 
-    private String fname;
+    private String nameType;
     /** 父ID */
     @Excel(name = "父ID")
     private Long pid;
 
+    private Long sskId;
 
-    public String getFname() {
-        return fname;
+    private String type;
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getNameType() {
+        return nameType;
     }
 
-    public void setFname(String fname) {
-        this.fname = fname;
+    public void setNameType(String nameType) {
+        this.nameType = nameType;
     }
 
     /** 状态 */
@@ -67,6 +78,15 @@ public class ActClassification extends BaseEntity
     {
         return pid;
     }
+
+    public Long getSskId() {
+        return sskId;
+    }
+
+    public void setSskId(Long sskId) {
+        this.sskId = sskId;
+    }
+
     public void setStatus(Integer status)
     {
         this.status = status;

ruoyi-supplies/src/main/java/com/ruoyi/system/mapper/ActClassificationMapper.java

@@ -73,5 +73,7 @@ public interface ActClassificationMapper
     List<ActClassification> selectAll();
     List<ActClassification> selectByParentId(int parentId);
 
-    List<ActClassification> savePid();
+    List<ActClassification> savePid(Long sskId);
+
+    List<ActClassification> selectSubActDy(int sskId);
 }

ruoyi-supplies/src/main/java/com/ruoyi/system/service/IActClassificationService.java

@@ -82,5 +82,7 @@ public interface IActClassificationService
     List<ActClassification> getAllActClassifications();
     List<ActClassification> getSubActClassifications(int parentId);
 
-    List<ActClassification> savePid();
+    List<ActClassification> savePid(Long sskId);
+
+    List<ActClassification> getSubActClassDy(int sskId);
 }

ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActClassificationServiceImpl.java

@@ -58,6 +58,7 @@ public class ActClassificationServiceImpl implements IActClassificationService
     public int insertActClassification(ActClassification actClassification)
     {
         actClassification.setCreateTime(DateUtils.getNowDate());
+
         return actClassificationMapper.insertActClassification(actClassification);
     }
 
@@ -133,8 +134,13 @@ public class ActClassificationServiceImpl implements IActClassificationService
 
     }
     @Override
-    public List<ActClassification> savePid() {
-        return actClassificationMapper.savePid();
+    public List<ActClassification> savePid(Long sskId) {
+        return actClassificationMapper.savePid(sskId);
+    }
+
+    @Override
+    public List<ActClassification> getSubActClassDy(int sskId) {
+        return actClassificationMapper.selectSubActDy(sskId);
     }
 
     @Override

ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesHistorydataServiceImpl.java

@@ -301,7 +301,6 @@ public class ActSuppliesHistorydataServiceImpl implements IActSuppliesHistorydat
 
             public void run() {
 
-
                 //导入清洗表数据
                 for (int i = 0; i < actOperation2s.size(); i++) {
                     //JSONArray parse = (JSONArray) JSONArray.parse(actOperation2s.get(i).getHistoryRole());
@@ -351,9 +350,6 @@ public class ActSuppliesHistorydataServiceImpl implements IActSuppliesHistorydat
                     }
                 }
 
-
-
-
 //                for (int i = 0; i < actOperation2s.size(); i++) {
 //
 //                    //获取导入excel表数据存储到生成表实体类中
@@ -429,6 +425,7 @@ public class ActSuppliesHistorydataServiceImpl implements IActSuppliesHistorydat
                                     if (actOperation2s.get(i).getActOperation2()[x][y].getV() != null) {
                                         try {
                                             actSuppliesImportTable.getClass().getMethod("set" + attributes[y], String.class).invoke(actSuppliesImportTable, actOperation2s.get(i).getActOperation2()[x][y].getV());
+
                                         } catch (Exception e) {
                                             e.printStackTrace();
                                         }

ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesServiceImpl.java

@@ -117,7 +117,7 @@ public class ActSuppliesServiceImpl implements IActSuppliesService
         actSupplies.setUpdateBy(user.getUserName());
         actSupplies.setUpdateTime(DateUtils.getNowDate());
 
-         return actSuppliesMapper.updateActSupplies(actSupplies);
+        return actSuppliesMapper.updateActSupplies(actSupplies);
     }
 
     /**

ruoyi-supplies/src/main/resources/mapper/system/ActClassificationMapper.xml

@@ -8,7 +8,9 @@
         <result property="id"    column="id"    />
         <result property="name"    column="name"    />
         <result property="pid"    column="pid"    />
-        <result property="fname"    column="fname"    />
+        <result property="nameType"    column="fname"    />
+        <result property="type"    column="type"    />
+        <result property="sskId"    column="ssk_id"    />
         <result property="status"    column="status"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
@@ -17,12 +19,12 @@
     </resultMap>
 
     <sql id="selectActClassificationVo">
-        select id, name, pid, status, create_by, create_time, update_by, update_time from act_classification
+        select id, name, name_type ,type,ssk_id, pid, status, create_by, create_time, update_by, update_time from act_classification
     </sql>
 
     <select id="selectActClassificationList" parameterType="ActClassification" resultMap="ActClassificationResult">
-        select a.id, a.name, a.pid, a.status, a.create_by,  a.update_by, b.name fname from act_classification  a  left join act_classification b on a.pid = b.id
-     <where>
+        select a.id, a.name,a.type,a.ssk_id, a.pid, a.status, a.create_by,  a.update_by, b.name fname from act_classification  a  left join act_classification b on a.pid = b.id
+    <where>
     <if test="name != null">and a.name = #{name }</if>
     <if test="id != null">and a.pid = #{id}</if>
     <if test="status != null"> and a.status=#{status}</if>
@@ -34,8 +36,8 @@
         where id = #{id}
     </select>
 
-    <select id="savePid" parameterType="ActClassification" resultMap="ActClassificationResult">
-       select id ,pid,name from act_classification where pid=0 and status = 0;
+    <select id="savePid" parameterType="Long" resultMap="ActClassificationResult">
+       select id ,pid,name from act_classification where type = 2 and ssk_id = #{sskId} and status = 0;
     </select>
 
     <update id="setEnable" parameterType="java.util.Map">
@@ -57,7 +59,9 @@
         insert into act_classification
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="name != null">name,</if>
+            <if test="type != null">type,</if>
             <if test="pid != null">pid,</if>
+            <if test="sskId != null">ssk_id,</if>
             <if test="status != null">status,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
@@ -66,7 +70,9 @@
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="name != null">#{name},</if>
+            <if test="type != null">#{type},</if>
             <if test="pid != null">#{pid},</if>
+            <if test="sskId != null">#{sskId},</if>
             <if test="status != null">#{status},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -79,7 +85,9 @@
         update act_classification
         <trim prefix="SET" suffixOverrides=",">
             <if test="name != null">name = #{name},</if>
+            <if test="type != null">type = #{type},</if>
             <if test="pid != null">pid = #{pid},</if>
+            <if test="sskId != null">ssk_id = #{sskId},</if>
             <if test="status != null">status = #{status},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
@@ -115,4 +123,8 @@
         WHERE pid = #{parentId}
     </select>
 
+    <select id="selectSubActDy" parameterType="Integer" resultMap="ActClassificationResult">
+        select a.name , b.name fname from act_classification  a  left join act_classification b on a.pid = b.id and a.ssk_id={sskId}
+    </select>
+
 </mapper>
\ No newline at end of file

ruoyi-ui/src/api/ActClassification/ActClassification.js

@@ -11,9 +11,9 @@ export function listActClassification(query) {
 }
 
 //查询上级ID
-export function savePid() {
+export function savePid(sskId) {
     return request({
-        url: '/ActClassification/ActClassification/savepid',
+        url: '/ActClassification/ActClassification/savepid/'+sskId,
         method: 'get'
     })
 }