Skip to content

K
klck
Commit 10217e9e authored by hehongwei's avatar hehongwei
Browse files
Options

32类物料导出

parent c7d27cf4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 638 additions and 374 deletions
ruoyi-activiti/src/main/java/com/ruoyi/activiti/controller/BizExampleDemoController.java
View file @ 10217e9e
......@@ -6,7 +6,6 @@ import java.util.List;
import java.util.Map;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.ruoyi.activiti.service.IProcessService;
import lombok.AllArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
......@@ -20,9 +19,6 @@ import com.ruoyi.activiti.service.IBizExampleDemoService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
import static com.ruoyi.common.core.domain.AjaxResult.error;
import static com.ruoyi.common.core.domain.AjaxResult.success;
/**
* 示例DemoController
*
......
ruoyi-activiti/src/main/java/com/ruoyi/activiti/modeler/ModelerController.java
View file @ 10217e9e
......@@ -35,8 +35,6 @@ import java.io.ByteArrayInputStream;
import java.nio.charset.StandardCharsets;
import java.util.*;
import static com.ruoyi.common.core.domain.AjaxResult.error;
import static com.ruoyi.common.core.domain.AjaxResult.success;
import static org.activiti.editor.constants.ModelDataJsonConstants.MODEL_DESCRIPTION;
import static org.activiti.editor.constants.ModelDataJsonConstants.MODEL_NAME;
......
ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesController.java
View file @ 10217e9e
......@@ -28,7 +28,6 @@ public class ActSuppliesController extends BaseController
@Autowired
private IActSuppliesService actSuppliesService;
@PreAuthorize("@ss.hasPermi('Actsupplies:Actsupplies:options')")
@GetMapping("/options")
@ResponseBody
......
ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesHistorydataController.java
View file @ 10217e9e
......@@ -3,6 +3,7 @@ package com.ruoyi.system.controller;
import java.util.List;
import com.ruoyi.system.domain.ActOperation1;
import com.ruoyi.system.domain.ActSuppliesImportCleaningAcc;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
......@@ -200,5 +201,16 @@ public class ActSuppliesHistorydataController extends BaseController
return toAjax(1);
}
/**
* 数据清洗 通用导入表数据
*/
@PreAuthorize("@ss.hasPermi('system:historydata:selectActsuppliesCleaningCopyAcc')")
@GetMapping("/selectActsuppliesCleaningCopyAcc/{id}")
public TableDataInfo selectActsuppliesCleaningCopyAcc(@PathVariable("id") Long id)
{
List<ActSuppliesImportCleaningAcc> actSuppliesImportCleaningAccs = actSuppliesHistorydataService.selectActSuppliesCleaningCopyAcc(id);
return getDataTable(actSuppliesImportCleaningAccs);
}
}
ruoyi-supplies/src/main/java/com/ruoyi/system/mapper/ActSuppliesCleaningRuleMapper.java
View file @ 10217e9e
......@@ -34,4 +34,6 @@ public interface ActSuppliesCleaningRuleMapper
void addInsertConvertAcc(ActSuppliesImportTable actSuppliesImportTable);
void addActSuppliesImportCleaningAcc(ActSuppliesImportCleaningAcc actSuppliesImportCleaningAcc);
List<ActSuppliesImportCleaningAcc> selectActSuppliesCleaningCopy(Long id);
}
ruoyi-supplies/src/main/java/com/ruoyi/system/mapper/ActSuppliesHistorydataMapper.java
View file @ 10217e9e
......@@ -97,4 +97,8 @@ public interface ActSuppliesHistorydataMapper
void updateActSuppliesHistorydataStatusByIdAcc(Long gethId);
List<ActSuppliesHistorydata> selectActSuppliesHistorydataAcc(Integer tylkStatus);
List<ActSuppliesHistorydata> selectActSuppliesHistorydataCopyList(ActSuppliesHistorydata actSuppliesHistorydata);
ActSuppliesHistorydata selectActSuppliesHistorydataCopyById(Long id);
}
ruoyi-supplies/src/main/java/com/ruoyi/system/service/IActSuppliesHistorydataService.java
View file @ 10217e9e
......@@ -4,6 +4,7 @@ import java.util.List;
import com.ruoyi.system.domain.ActOperation1;
import com.ruoyi.system.domain.ActSuppliesHistorydata;
import com.ruoyi.system.domain.ActSuppliesImportCleaningAcc;
/**
* 历史数据Service接口
......@@ -90,4 +91,6 @@ public interface IActSuppliesHistorydataService
void addInsertActSuppliesHistorydataAcc(List<ActSuppliesHistorydata> actSuppliesHistorydata);
List<ActSuppliesHistorydata> selectActSuppliesHistorydataAcc(Integer tylkStatus);
List<ActSuppliesImportCleaningAcc> selectActSuppliesCleaningCopyAcc(Long id);
}
ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesHistorydataServiceImpl.java
View file @ 10217e9e
package com.ruoyi.system.service.impl;
import java.math.BigDecimal;
import java.text.DecimalFormat;
import java.util.*;
import com.alibaba.fastjson.JSONArray;
......@@ -47,7 +48,9 @@ public class ActSuppliesHistorydataServiceImpl implements IActSuppliesHistorydat
@Override
public ActSuppliesHistorydata selectActSuppliesHistorydataById(Long id)
{
return actSuppliesHistorydataMapper.selectActSuppliesHistorydataById(id);
//return actSuppliesHistorydataMapper.selectActSuppliesHistorydataById(id);
return actSuppliesHistorydataMapper.selectActSuppliesHistorydataCopyById(id);
}
/**
......@@ -60,8 +63,10 @@ public class ActSuppliesHistorydataServiceImpl implements IActSuppliesHistorydat
public List<ActSuppliesHistorydata> selectActSuppliesHistorydataList(ActSuppliesHistorydata actSuppliesHistorydata)
{
SysUser user = SecurityUtils.getLoginUser().getUser();
actSuppliesHistorydata.setCreateBy(user.getUserName());
return actSuppliesHistorydataMapper.selectActSuppliesHistorydataList(actSuppliesHistorydata);
actSuppliesHistorydata.setCreateBy(user.getUserName());
//return actSuppliesHistorydataMapper.selectActSuppliesHistorydataList(actSuppliesHistorydata);
return actSuppliesHistorydataMapper.selectActSuppliesHistorydataCopyList(actSuppliesHistorydata);
}
/**
......@@ -719,7 +724,9 @@ public class ActSuppliesHistorydataServiceImpl implements IActSuppliesHistorydat
actSuppliesImportCleaningAcc.setMoneyColumn(actOperation2s.get(i).getActOperation2()[x][((int) parse.getJSONObject(0).get("MoneyColumn") - 1)].getV());
BigDecimal moneyColumn1 = new BigDecimal(Double.parseDouble(actOperation2s.get(i).getActOperation2()[x][((int) parse.getJSONObject(0).get("MoneyColumn") - 1)].getV()));
BigDecimal moneyColumn2 = new BigDecimal(Double.parseDouble(actOperation2s.get(i).getActOperation2()[x][((int) parse.getJSONObject(0).get("NumberColumn") - 1)].getV()));
actSuppliesImportCleaningAcc.setMoneyColumns(Double.toString(moneyColumn1.multiply(moneyColumn2).doubleValue()));
DecimalFormat df = new DecimalFormat("#.00");
actSuppliesImportCleaningAcc.setMoneyColumns(df.format(Double.parseDouble(actOperation2s.get(i).getActOperation2()[x][((int) parse.getJSONObject(0).get("MoneyColumn") - 1)].getV())*Double.parseDouble(actOperation2s.get(i).getActOperation2()[x][((int) parse.getJSONObject(0).get("NumberColumn") - 1)].getV())));
Object dateColumn = parse.getJSONObject(0).get("DateColumn");
if(parse.getJSONObject(0).get("DateColumn").hashCode()>0){
actSuppliesImportCleaningAcc.setDateColumn(actOperation2s.get(i).getActOperation2()[x][((int) parse.getJSONObject(0).get("DateColumn") - 1)].getV());
......@@ -749,7 +756,6 @@ public class ActSuppliesHistorydataServiceImpl implements IActSuppliesHistorydat
}
//修改历史表中的数据状态（是否清洗）
actSuppliesHistorydataMapper.updateActSuppliesHistorydataStatusByIdAcc(actOperation2s.get(i).gethId());
......@@ -801,4 +807,12 @@ public class ActSuppliesHistorydataServiceImpl implements IActSuppliesHistorydat
}
@Override
public List<ActSuppliesImportCleaningAcc> selectActSuppliesCleaningCopyAcc(Long id) {
return actSuppliesCleaningRuleMapper.selectActSuppliesCleaningCopy(id);
}
}
ruoyi-supplies/src/main/resources/mapper/system/ActSuppliesCleaningRuleMapper.xml
View file @ 10217e9e
......@@ -22,6 +22,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="createTime" column="create_time" />
</resultMap>
<resultMap type="ActSuppliesImportCleaningAcc" id="ActSuppliesImportCleaningResultAcc">
<result property="id" column="id" />
<result property="hId" column="h_id" />
<result property="sskId" column="ssk_id" />
<result property="hdate" column="hdate" />
<result property="kmCode" column="km_code"/>
<result property="nameColumn" column="name_column"/>
<result property="codeColumn" column="code_column" />
<result property="departmentColumn" column="department_column" />
<result property="numberColumn" column="number_column" />
<result property="moneyColumn" column="money_column" />
<result property="moneyColumns" column="money_columns" />
<result property="dateColumn" column="date_column" />
<result property="sOfExpenses" column="source_of_expenses" />
<result property="categories" column="categories" />
</resultMap>
<select id="selectActSuppliesCleaningCopy" parameterType="Long" resultMap="ActSuppliesImportCleaningResultAcc">
SELECT ssk_id,hdate,department_column,categories,source_of_expenses,SUM(number_column) number_column,SUM(money_column) money_column,SUM(money_columns) money_columns FROM act_supplies_import_cleaning_copy1 WHERE hid = #{id} GROUP BY department_column,categories,hdate,ssk_id,source_of_expenses
</select>
<insert id="insertActSuppliesImportCleaning" parameterType="ActSuppliesImportCleaning" useGeneratedKeys="true" keyProperty="id">
insert into act_supplies_import_cleaning
......
ruoyi-supplies/src/main/resources/mapper/system/ActSuppliesHistorydataMapper.xml
View file @ 10217e9e
......@@ -46,6 +46,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
</select>
<select id="selectActSuppliesHistorydataCopyList" parameterType="ActSuppliesHistorydata" resultMap="ActSuppliesHistorydataResult">
<!--<include refid="selectActSuppliesHistorydataVo"/>-->
SELECT t1.id, t1.template_id, t2.template_name, t1.import_uuid, t1.export_uuid, t1.history_name, t1.history_role, t1.identifying_code, t1.status, t1.create_by, t1.create_time, t1.clean_status
FROM act_supplies_historydata_copy1 t1
LEFT JOIN act_supplies_template t2 ON t1.template_id = t2.id
<where>
<if test="templateName != null and templateName != ''"> and t2.template_name like concat('%', #{templateName}, '%')</if>
<if test="historyName != null and historyName != ''"> and history_name like concat('%', #{historyName}, '%')</if>
<if test="identifyingCode != null "> and identifying_code = #{identifyingCode}</if>
<if test="status != null "> and status = #{status}</if>
</where>
</select>
<select id="selectActSuppliesHistorydataById" parameterType="Long" resultMap="ActSuppliesHistorydataResult">
SELECT t1.id, t1.template_id, t1.import_uuid, t1.export_uuid, t1.role_id, t1.history_name, t1.history_role,t2.history_content, t1.identifying_code, t1.status, t1.create_by, t1.create_time
FROM act_supplies_historydata t1
......@@ -55,6 +69,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
</select>
<select id="selectActSuppliesHistorydataCopyById" parameterType="Long" resultMap="ActSuppliesHistorydataResult">
SELECT t1.id, t1.template_id, t1.import_uuid, t1.export_uuid, t1.history_name, t1.history_role,t2.history_content, t1.identifying_code, t1.status, t1.create_by, t1.create_time
FROM act_supplies_historydata_copy1 t1
LEFT JOIN act_supplies_historycontent_copy1 t2 ON t1.import_uuid = t2.hid
<where>
t1.id = #{id}
</where>
</select>
<insert id="insertActSuppliesHistorydata" parameterType="ActSuppliesHistorydata" useGeneratedKeys="true" keyProperty="id">
insert into act_supplies_historydata
<trim prefix="(" suffix=")" suffixOverrides=",">
......
ruoyi-ui/src/api/system/historydata.js
View file @ 10217e9e
......@@ -3,115 +3,122 @@ import LuckyExcel from "luckyexcel";
// 查询 历史数据列表
export function listHistorydata(query) {
return request({
url: '/system/historydata/list',
method: 'get',
params: query
})
return request({
url: '/system/historydata/list',
method: 'get',
params: query
})
}
// 查询 历史数据详细
export function getHistorydata(id) {
return request({
url: '/system/historydata/' + id,
method: 'get'
})
return request({
url: '/system/historydata/' + id,
method: 'get'
})
}
// 新增 历史数据
export function addHistorydata(data) {
return request({
url: '/system/historydata',
method: 'post',
data: data
})
return request({
url: '/system/historydata',
method: 'post',
data: data
})
}
// 修改 历史数据
export function updateHistorydata(data) {
return request({
url: '/system/historydata',
method: 'put',
data: data
})
return request({
url: '/system/historydata',
method: 'put',
data: data
})
}
// 删除 历史数据
export function delHistorydata(id) {
return request({
url: '/system/historydata/' + id,
method: 'delete'
})
return request({
url: '/system/historydata/' + id,
method: 'delete'
})
}
// 导出 历史数据
export function exportHistorydata(query) {
return request({
url: '/system/historydata/export',
method: 'get',
params: query
})
return request({
url: '/system/historydata/export',
method: 'get',
params: query
})
}
// 新增 历史数据
export function addInsert(data) {
return request({
url: '/system/historydata/addInsertAccount',
method: 'post',
data: data
})
return request({
url: '/system/historydata/addInsertAccount',
method: 'post',
data: data
})
}
// 数据清洗 历史数据
export function addInsert1(data) {
return request({
url: '/system/historydata/addInsert1',
method: 'post',
data: data
})
return request({
url: '/system/historydata/addInsert1',
method: 'post',
data: data
})
}
//清洗通用凭证单
export function addInsertAccount1(data) {
return request({
url: '/system/historydata/addInsertAccount1',
method: 'post',
data: data
})
return request({
url: '/system/historydata/addInsertAccount1',
method: 'post',
data: data
})
}
//清洗通用凭证单
export function addInsertAccount2(data) {
console.log(data,'我发送的数据')
return request({
url: '/system/historydata/addInsertAccount2',
method: 'post',
data: data
})
console.log(data, '我发送的数据')
return request({
url: '/system/historydata/addInsertAccount2',
method: 'post',
data: data
})
}
// 数据清洗 历史数据
export function addInsert2(data) {
return request({
url: '/system/historydata/addInsert2',
method: 'post',
data: data
})
return request({
url: '/system/historydata/addInsert2',
method: 'post',
data: data
})
}
// 数据清洗 历史数据
export function addInsertConvert1(data) {
return request({
url: '/system/historydata/addInsertConvert1',
method: 'post',
data: data
})
return request({
url: '/system/historydata/addInsertConvert1',
method: 'post',
data: data
})
}
// 数据清洗 历史数据
export function addInsertConvert2(data) {
return request({
url: '/system/historydata/addInsertConvert2',
method: 'post',
data: data
})
return request({
url: '/system/historydata/addInsertConvert2',
method: 'post',
data: data
})
}
//导出32类材料
export function selectExport(id) {
return request({
url: 'system/historydata/selectActsuppliesCleaningCopyAcc/'+id,
method: 'get'
})
}
ruoyi-ui/src/views/system/supplies/upload.vue
View file @ 10217e9e
......@@ -357,6 +357,7 @@ export default {
}, 500), // 设置延迟时间，单位为毫秒
}
// 配置项111
};
// debounce函数定义
function debounce(func, delay) {
......
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