Skip to content

K
klck
Commit 19c6fd0a authored by lvzhuangzhuang's avatar lvzhuangzhuang
Browse files
Options

1

parent 737d66cf
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1532 additions and 25 deletions
ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesCleaningRuleController.java
View file @ 19c6fd0a
......@@ -5,6 +5,7 @@ import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.system.domain.ActSuppliesHistorydata;
import com.ruoyi.system.domain.ActSuppliesImportTable;
import com.ruoyi.system.domain.ActSuppliesSixMinesSummaryTable;
import com.ruoyi.system.service.IActSuppliesCleaningRuleService;
import com.ruoyi.system.service.IActSuppliesHistorydataService;
......@@ -44,7 +45,7 @@ public class ActSuppliesCleaningRuleController extends BaseController
}
/**
* 新增
* 新增生成表
*/
@PreAuthorize("@ss.hasPermi('system:cleaningrule:addActSuppliesSixMinesSummaryTable')")
@Log(title = " 六矿数据汇总", businessType = BusinessType.INSERT)
......@@ -56,5 +57,20 @@ public class ActSuppliesCleaningRuleController extends BaseController
return toAjax(i);
}
/**
* 新增导入表
*/
@PreAuthorize("@ss.hasPermi('system:cleaningrule:addActSuppliesImportTable')")
@Log(title = " 新增导入表", businessType = BusinessType.INSERT)
@PostMapping("/addActSuppliesImportTable")
public AjaxResult addActSuppliesImportTable(@RequestBody ActSuppliesImportTable actSuppliesImportTable)
{
/*@RequestBody ActSuppliesImportTable actSuppliesImportTable*/
int i = actSuppliesCleaningRuleService.addActSuppliesImportTable(actSuppliesImportTable);
int j = actSuppliesHistorydataService.updateActSuppliesHistorydataStatusById(actSuppliesImportTable.gethId());
return toAjax(i);
}
}
ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSuppliesSixMinesSummaryTable.java
View file @ 19c6fd0a
......@@ -53,6 +53,10 @@ public class ActSuppliesSixMinesSummaryTable extends BaseEntity
@Excel(name = "日期")
private String hDate;
/** 所属矿区 */
@Excel(name = "所属矿区")
private String mining;
public static long getSerialVersionUID() {
return serialVersionUID;
}
......@@ -139,6 +143,14 @@ public class ActSuppliesSixMinesSummaryTable extends BaseEntity
this.hDate = hDate;
}
public String getMining() {
return mining;
}
public void setMining(String mining) {
this.mining = mining;
}
@Override
public String toString() {
return "ActSuppliesSixMinesSummaryTable{" +
......@@ -151,7 +163,8 @@ public class ActSuppliesSixMinesSummaryTable extends BaseEntity
", nuitPrice=" + nuitPrice +
", money=" + money +
", createBy='" + createBy + '\'' +
", hDate=" + hDate +
", hDate='" + hDate + '\'' +
", mining='" + mining + '\'' +
'}';
}
}
ruoyi-supplies/src/main/java/com/ruoyi/system/mapper/ActSuppliesCleaningRuleMapper.java
View file @ 19c6fd0a
package com.ruoyi.system.mapper;
import com.ruoyi.system.domain.ActSuppliesHistorydata;
import com.ruoyi.system.domain.ActSuppliesImportTable;
import com.ruoyi.system.domain.ActSuppliesSixMinesSummaryTable;
import java.util.List;
......@@ -16,4 +17,6 @@ public interface ActSuppliesCleaningRuleMapper
int addActSuppliesSixMinesSummaryTable(ActSuppliesSixMinesSummaryTable actSuppliesSixMinesSummaryTable);
int addActSuppliesImportTable(ActSuppliesImportTable actSuppliesImportTable);
}
ruoyi-supplies/src/main/java/com/ruoyi/system/service/IActSuppliesCleaningRuleService.java
View file @ 19c6fd0a
package com.ruoyi.system.service;
import com.ruoyi.system.domain.ActSuppliesHistorydata;
import com.ruoyi.system.domain.ActSuppliesImportTable;
import com.ruoyi.system.domain.ActSuppliesSixMinesSummaryTable;
import java.util.List;
......@@ -15,4 +16,6 @@ public interface IActSuppliesCleaningRuleService
{
int addActSuppliesSixMinesSummaryTable(ActSuppliesSixMinesSummaryTable actSuppliesSixMinesSummaryTable);
int addActSuppliesImportTable(ActSuppliesImportTable actSuppliesImportTable);
}
ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesCleaningRuleServiceImpl.java
View file @ 19c6fd0a
package com.ruoyi.system.service.impl;
import com.ruoyi.system.domain.ActSuppliesImportTable;
import com.ruoyi.system.domain.ActSuppliesSixMinesSummaryTable;
import com.ruoyi.system.mapper.ActSuppliesCleaningRuleMapper;
......@@ -29,4 +30,9 @@ public class ActSuppliesCleaningRuleServiceImpl implements IActSuppliesCleaningR
public int addActSuppliesSixMinesSummaryTable(ActSuppliesSixMinesSummaryTable actSuppliesSixMinesSummaryTable) {
return actSuppliesCleaningRuleMapper.addActSuppliesSixMinesSummaryTable(actSuppliesSixMinesSummaryTable);
}
@Override
public int addActSuppliesImportTable(ActSuppliesImportTable actSuppliesImportTable) {
return actSuppliesCleaningRuleMapper.addActSuppliesImportTable(actSuppliesImportTable);
}
}
ruoyi-supplies/src/main/resources/mapper/system/ActSuppliesCleaningRuleMapper.xml
View file @ 19c6fd0a
......@@ -3,19 +3,6 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.ActSuppliesCleaningRuleMapper">
<resultMap type="ActSuppliesSixMinesSummaryTable" id="ActSuppliesSixMinesSummaryTableResult">
<result property="Id" column="id" />
<result property="hId" column="h_id" />
<result property="projectId" column="project_id" />
<result property="projectName" column="project_name" />
<result property="departmentName" column="department_name" />
<result property="number" column="number" />
<result property="nuitPrice" column="nuit_price" />
<result property="money" column="money" />
<result property="createBy" column="create_by" />
<result property="hDate" column="date" />
</resultMap>
<insert id="addActSuppliesSixMinesSummaryTable" parameterType="ActSuppliesSixMinesSummaryTable" useGeneratedKeys="true" keyProperty="id">
insert into act_supplies_sixminessummarytable
<trim prefix="(" suffix=")" suffixOverrides=",">
......@@ -28,6 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="money != null">money,</if>
<if test="createBy != null">create_by,</if>
<if test="hDate != null">h_date,</if>
<if test="mining != null">ssk_id,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="hId != null">#{hId},</if>
......@@ -39,9 +27,150 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="money != null">#{money},</if>
<if test="createBy != null">#{createBy},</if>
<if test="hDate != null">#{hDate},</if>
<if test="mining != null">#{mining},</if>
</trim>
</insert>
<insert id="addActSuppliesImportTable" parameterType="ActSuppliesImportTable" useGeneratedKeys="true" keyProperty="id">
insert into act_supplies_import_table
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="hId != null">h_id,</if>
<if test="hDate != null">h_date,</if>
<if test="mining != null">ssk_id,</if>
<if test="a1 != null">a1,</if>
<if test="a2 != null">a2,</if>
<if test="a3 != null">a3,</if>
<if test="a4 != null">a4,</if>
<if test="a5 != null">a5,</if>
<if test="a6 != null">a6,</if>
<if test="a7 != null">a7,</if>
<if test="a8 != null">a8,</if>
<if test="a9 != null">a9,</if>
<if test="a10 != null">a10,</if>
<if test="a11 != null">a11,</if>
<if test="a12 != null">a12,</if>
<if test="a13 != null">a13,</if>
<if test="a14 != null">a14,</if>
<if test="a15 != null">a15,</if>
<if test="a16 != null">a16,</if>
<if test="a17 != null">a17,</if>
<if test="a18 != null">a18,</if>
<if test="a19 != null">a19,</if>
<if test="a20 != null">a20,</if>
<if test="a21 != null">a21,</if>
<if test="a22 != null">a22,</if>
<if test="a23 != null">a23,</if>
<if test="a24 != null">a24,</if>
<if test="a25 != null">a25,</if>
<if test="a26 != null">a26,</if>
<if test="a27 != null">a27,</if>
<if test="a28 != null">a28,</if>
<if test="a29 != null">a29,</if>
<if test="a30 != null">a30,</if>
<if test="a31 != null">a31,</if>
<if test="a32 != null">a32,</if>
<if test="a33 != null">a33,</if>
<if test="a34 != null">a34,</if>
<if test="a35 != null">a35,</if>
<if test="a36 != null">a36,</if>
<if test="a37 != null">a37,</if>
<if test="a38 != null">a38,</if>
<if test="a39 != null">a39,</if>
<if test="a40 != null">a40,</if>
<if test="a41 != null">a41,</if>
<if test="a42 != null">a42,</if>
<if test="a43 != null">a43,</if>
<if test="a44 != null">a44,</if>
<if test="a45 != null">a45,</if>
<if test="a46 != null">a46,</if>
<if test="a47 != null">a47,</if>
<if test="a48 != null">a48,</if>
<if test="a49 != null">a49,</if>
<if test="a50 != null">a50,</if>
<if test="a51 != null">a51,</if>
<if test="a52 != null">a52,</if>
<if test="a53 != null">a53,</if>
<if test="a54 != null">a54,</if>
<if test="a55 != null">a55,</if>
<if test="a56 != null">a56,</if>
<if test="a57 != null">a57,</if>
<if test="a58 != null">a58,</if>
<if test="a59 != null">a59,</if>
<if test="a60 != null">a60,</if>
<if test="a61 != null">a61,</if>
<if test="a62 != null">a62,</if>
<if test="a63 != null">a63,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="hId != null">#{hId},</if>
<if test="hDate != null">#{hDate},</if>
<if test="mining != null">#{mining},</if>
<if test="a1 != null">#{a1},</if>
<if test="a2 != null">#{a2},</if>
<if test="a3 != null">#{a3},</if>
<if test="a4 != null">#{a4},</if>
<if test="a5 != null">#{a5},</if>
<if test="a6 != null">#{a6},</if>
<if test="a7 != null">#{a7},</if>
<if test="a8 != null">#{a8},</if>
<if test="a9 != null">#{a9},</if>
<if test="a10 != null">#{a10},</if>
<if test="a11 != null">#{a11},</if>
<if test="a12 != null">#{a12},</if>
<if test="a13 != null">#{a13},</if>
<if test="a14 != null">#{a14},</if>
<if test="a15 != null">#{a15},</if>
<if test="a16 != null">#{a16},</if>
<if test="a17 != null">#{a17},</if>
<if test="a18 != null">#{a18},</if>
<if test="a19 != null">#{a19},</if>
<if test="a20 != null">#{a20},</if>
<if test="a21 != null">#{a21},</if>
<if test="a22 != null">#{a22},</if>
<if test="a23 != null">#{a23},</if>
<if test="a24 != null">#{a24},</if>
<if test="a25 != null">#{a25},</if>
<if test="a26 != null">#{a26},</if>
<if test="a27 != null">#{a27},</if>
<if test="a28 != null">#{a28},</if>
<if test="a29 != null">#{a29},</if>
<if test="a30 != null">#{a30},</if>
<if test="a31 != null">#{a31},</if>
<if test="a32 != null">#{a32},</if>
<if test="a33 != null">#{a33},</if>
<if test="a34 != null">#{a34},</if>
<if test="a35 != null">#{a35},</if>
<if test="a36 != null">#{a36},</if>
<if test="a37 != null">#{a37},</if>
<if test="a38 != null">#{a38},</if>
<if test="a39 != null">#{a39},</if>
<if test="a40 != null">#{a40},</if>
<if test="a41 != null">#{a41},</if>
<if test="a42 != null">#{a42},</if>
<if test="a43 != null">#{a43},</if>
<if test="a44 != null">#{a44},</if>
<if test="a45 != null">#{a45},</if>
<if test="a46 != null">#{a46},</if>
<if test="a47 != null">#{a47},</if>
<if test="a48 != null">#{a48},</if>
<if test="a49 != null">#{a49},</if>
<if test="a50 != null">#{a50},</if>
<if test="a51 != null">#{a51},</if>
<if test="a52 != null">#{a52},</if>
<if test="a53 != null">#{a53},</if>
<if test="a54 != null">#{a54},</if>
<if test="a55 != null">#{a55},</if>
<if test="a56 != null">#{a56},</if>
<if test="a57 != null">#{a57},</if>
<if test="a58 != null">#{a58},</if>
<if test="a59 != null">#{a59},</if>
<if test="a60 != null">#{a60},</if>
<if test="a61 != null">#{a61},</if>
<if test="a62 != null">#{a62},</if>
<if test="a63 != null">#{a63},</if>
</trim>
</insert>
</mapper>
......
ruoyi-supplies/src/main/resources/mapper/system/ActSuppliesHistorydataMapper.xml
View file @ 19c6fd0a
......@@ -19,10 +19,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="status" column="status" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="date" column="date" />
<result property="mining" column="ssk_id" />
</resultMap>
<sql id="selectActSuppliesHistorydataVo">
select id, import_uuid, template_id, export_uuid, role_id, history_name, history_content, identifying_code,clean_status ,status, create_by, date, create_time from act_supplies_historydata
select id, import_uuid, template_id, export_uuid, role_id, history_name, history_content, identifying_code,clean_status ,status, create_by, date, create_time, ssk_id from act_supplies_historydata
</sql>
<select id="selectActSuppliesHistorydataList" parameterType="ActSuppliesHistorydata" resultMap="ActSuppliesHistorydataResult">
......
ruoyi-ui/src/api/Actsupplies/cleaning_rule.js
View file @ 19c6fd0a
......@@ -9,7 +9,7 @@ export function selectActSuppliesHistorydata() {
})
}
// 新增物料关系管理
// 新增生成表
export function addActSuppliesSixMinesSummaryTable(data) {
return request({
url: '/system/cleaningrule/addActSuppliesSixMinesSummaryTable',
......@@ -18,7 +18,14 @@ export function addActSuppliesSixMinesSummaryTable(data) {
})
}
// 新增导入表
export function addActSuppliesImportTable(data) {
return request({
url: '/system/cleaningrule/addActSuppliesImportTable',
method: 'post',
data: data
})
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment