code转一二级分类（代码修改）-添加费用来源

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

@@ -16,5 +16,7 @@ public interface ActSuppliesMaterialMapper {
 
     void delete(@Param("mineId") String mineId, @Param("dateColumn") String dateColumn);
 
+    List<ActSuppliesMaterialDetails> getInfo(@Param("mineId") String mineId, @Param("dateColumn")String dateColumn);
+
     //void save(ActSuppliesMaterialInfo actSuppliesMaterialInfo);
 }

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

@@ -50,4 +50,12 @@
         where mine_id = #{mineId} and date_column = #{dateColumn}
     </delete>
 
+    <select id="getInfo" resultMap="ActSuppliesMaterialDetailsResult">
+        select name_column, code_column, department_column, number_column,
+               money_column, money, unit, model, mine_name,
+               mine_id, one_level, two_level, date_column, source_coloumn,spare
+        from act_supplies_material_info
+        where mine_id = #{mineId} and date_column = #{dateColumn}
+    </select>
+
 </mapper>
\ No newline at end of file

ruoyi-wages/src/main/java/com/ruoyi/system/model/wages/dao/WagesConversionData.java

@@ -23,6 +23,17 @@ public class WagesConversionData {
 
     private String mineId;
 
+    private Integer templateId;
+
+    public Integer getTemplateId() {
+
+        return templateId;
+    }
+
+    public void setTemplateId(Integer templateId) {
+        this.templateId = templateId;
+    }
+
     public String getMineId() {
         return mineId;
     }

ruoyi-wages/src/main/java/com/ruoyi/system/model/wages/vo/WagesConversionDataVO.java

@@ -14,6 +14,17 @@ public class WagesConversionDataVO {
 
     private String mineId;
 
+    private Integer templateId;
+
+    public Integer getTemplateId() {
+
+        return templateId;
+    }
+
+    public void setTemplateId(Integer templateId) {
+        this.templateId = templateId;
+    }
+
     public String getMineId() {
         return mineId;
     }

ruoyi-wages/src/main/resources/mapper/system/WagesConversionMapper.xml

@@ -12,11 +12,12 @@
         <result property="updateTime" column="update_date"/>
         <result property="yearMonth" column="wage_month"/>
         <result property="mineId" column="mine_id"/>
+        <result property="templateId" column="template_id"/>
     </resultMap>
 
     <insert id="save">
         insert into wages_conversion_data (json_data, if_generate_voucher, wage_month, value, mine_id)
-        values (#{jsonData}, 0, #{yearMonth}, #{value},#{mineId})
+        values (#{jsonData}, 0, #{yearMonth}, #{value},#{mineId},#{templateId})
     </insert>
     <delete id="deleteFromConversionToDate">
         delete
@@ -33,7 +34,9 @@
     </select>
     <select id="selectWagesConversionDataById" parameterType="integer"
             resultMap="WagesConversionData">
-        select id, json_data, if_generate_voucher, wage_month, create_date, update_date
+        select id, json_data, if_generate_voucher,
+               wage_month, create_date, update_date,mine_id,
+               template_id
         from wages_conversion_data
         where id = #{id}
     </select>