Skip to content

K
klck
Commit 2d2166f5 authored by PUPPET17's avatar PUPPET17
Browse files
Options

历史数据查询列表新增创建人

parent b6282f12
Hide whitespace changes
Inline Side-by-side
Showing with 367 additions and 93 deletions
ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ItemListQueryController.java 0 → 100644
View file @ 2d2166f5
package com.ruoyi.system.controller;
import com.alibaba.fastjson.JSONArray;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.system.service.IItemListQueryService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @author xyx
* @date 2024/4/22
*/
@RestController
@RequestMapping("/item")
public class ItemListQueryController extends BaseController {
@Autowired
private IItemListQueryService iItemListQueryService;
@PostMapping("/getList")
public TableDataInfo getItems(@RequestBody String sskId){
JSONArray itemList = iItemListQueryService.getItemList(sskId);
return getDataTable(itemList);
}
}
ruoyi-supplies/src/main/java/com/ruoyi/system/service/IItemListQueryService.java 0 → 100644
View file @ 2d2166f5
package com.ruoyi.system.service;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
/**
* @author xyx
* @date 2024/4/22
*/
public interface IItemListQueryService {
JSONArray getItemList(String sskId);
}
ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesAccountServiceImpl.java
View file @ 2d2166f5
...@@ -6,111 +6,218 @@ import com.alibaba.fastjson.JSONObject; ...@@ -6,111 +6,218 @@ import com.alibaba.fastjson.JSONObject;
import com.ruoyi.system.common.ReturnResult; import com.ruoyi.system.common.ReturnResult;
import com.ruoyi.system.domain.ActDispensing; import com.ruoyi.system.domain.ActDispensing;
import com.ruoyi.system.mapper.ActSuppliesAccountMapper; import com.ruoyi.system.mapper.ActSuppliesAccountMapper;
import com.ruoyi.system.model.doc.CustomDocRequestModel;
import com.ruoyi.system.service.IActSuppliesAccountService; import com.ruoyi.system.service.IActSuppliesAccountService;
//import com.ruoyi.system.yyinterface.VoucherUtils; import com.ruoyi.system.utils.AccSubjectReqParamHandler;
import com.ruoyi.system.utils.AuxiliaryAccRuleHandler;
import com.ruoyi.system.yyinterface.VoucherUtils;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import static com.ruoyi.system.constant.ApiConstant.YFXM_URL;
@Service @Service
public class ActSuppliesAccountServiceImpl implements IActSuppliesAccountService { public class ActSuppliesAccountServiceImpl implements IActSuppliesAccountService {
private static final JSONObject REQUEST_HTTP_BODY = new JSONObject();
static {
REQUEST_HTTP_BODY.put("accsubjectchart", "1896891590924304390");
REQUEST_HTTP_BODY.put("pk_org", "1685820920723669151");
}
private Logger logger = LoggerFactory.getLogger(ActSuppliesAccountServiceImpl.class); private Logger logger = LoggerFactory.getLogger(ActSuppliesAccountServiceImpl.class);
@Autowired @Autowired
private ActSuppliesAccountMapper actSuppliesAccountMapper; private ActSuppliesAccountMapper actSuppliesAccountMapper;
@Override
public List<ActDispensing> options(List<ActDispensing> actDispensings) { public List<ActDispensing> options(List<ActDispensing> actDispensings) {
for (int i = 0; i < actDispensings.size(); i++) {
for (int i=0;i<actDispensings.size();i++) { if (((ActDispensing)actDispensings.get(i)).getDepartment().equals("") || ((ActDispensing)actDispensings.get(i)).getDepartment() == null) {
if (actDispensings.get(i).getDepartment().equals("")||actDispensings.get(i).getDepartment()==null){ ActDispensing actDispensing1 = this.actSuppliesAccountMapper.selectActSuppliesAccpuntByName(((ActDispensing)actDispensings.get(i)).getName());
ActDispensing actDispensing = actSuppliesAccountMapper.selectActSuppliesAccpuntByName(actDispensings.get(i).getName()); if (actDispensing1 != null) {
if (actDispensing !=null){ ((ActDispensing)actDispensings.get(i)).setAccountingCode(actDispensing1.getAccountingCode());
actDispensings.get(i).setAccountingCode(actDispensing.getAccountingCode()); ((ActDispensing)actDispensings.get(i)).setAccountingNameA(actDispensing1.getAccountingNameA() + ',' + actDispensing1.getAccountingIdA());
actDispensings.get(i).setAccountingNameA(actDispensing.getAccountingNameA()+','+actDispensing.getAccountingIdA()); ((ActDispensing)actDispensings.get(i)).setAccountingNameB(actDispensing1.getAccountingNameB() + ',' + actDispensing1.getAccountingIdB());
actDispensings.get(i).setAccountingNameB(actDispensing.getAccountingNameB()+','+actDispensing.getAccountingIdB()); ((ActDispensing)actDispensings.get(i)).setAccountingNameC(actDispensing1.getAccountingNameC() + ',' + actDispensing1.getAccountingIdC());
actDispensings.get(i).setAccountingNameC(actDispensing.getAccountingNameC()+','+actDispensing.getAccountingIdC());
} }
}else { } else {
ActDispensing actDispensing = actSuppliesAccountMapper.selectActSuppliesAccpuntByName(actDispensings.get(i).getName() + '-' + actDispensings.get(i).getDepartment() + '-' + actDispensings.get(i).getMaterial()); ActDispensing actDispensing1 = this.actSuppliesAccountMapper.selectActSuppliesAccpuntByName(((ActDispensing)actDispensings.get(i)).getName() + '-' + ((ActDispensing)actDispensings.get(i)).getDepartment() + '-' + ((ActDispensing)actDispensings.get(i)).getMaterial());
if (actDispensing !=null){ if (actDispensing1 != null) {
actDispensings.get(i).setAccountingCode(actDispensing.getAccountingCode()); ((ActDispensing)actDispensings.get(i)).setAccountingCode(actDispensing1.getAccountingCode());
actDispensings.get(i).setAccountingNameA(actDispensing.getAccountingNameA()+','+actDispensing.getAccountingIdA()); ((ActDispensing)actDispensings.get(i)).setAccountingNameA(actDispensing1.getAccountingNameA() + ',' + actDispensing1.getAccountingIdA());
actDispensings.get(i).setAccountingNameB(actDispensing.getAccountingNameB()+','+actDispensing.getAccountingIdB()); ((ActDispensing)actDispensings.get(i)).setAccountingNameB(actDispensing1.getAccountingNameB() + ',' + actDispensing1.getAccountingIdB());
actDispensings.get(i).setAccountingNameC(actDispensing.getAccountingNameC()+','+actDispensing.getAccountingIdC()); ((ActDispensing)actDispensings.get(i)).setAccountingNameC(actDispensing1.getAccountingNameC() + ',' + actDispensing1.getAccountingIdC());
} }
} }
} }
List<ActDispensing> actDispensing = actSuppliesAccountMapper.selectActSuppliesAccpuntByCode(); List<ActDispensing> actDispensing = this.actSuppliesAccountMapper.selectActSuppliesAccpuntByCode();
for (int i=0;i<actDispensing.size();i++){ for (int j = 0; j < actDispensing.size(); j++) {
actDispensing.get(i).setAccountingNameA(actDispensing.get(i).getAccountingNameA()+','+actDispensing.get(i).getAccountingIdA()); ((ActDispensing)actDispensing.get(j)).setAccountingNameA(((ActDispensing)actDispensing.get(j)).getAccountingNameA() + ',' + ((ActDispensing)actDispensing.get(j)).getAccountingIdA());
actDispensing.get(i).setAccountingNameB(actDispensing.get(i).getAccountingNameB()+','+actDispensing.get(i).getAccountingIdB()); ((ActDispensing)actDispensing.get(j)).setAccountingNameB(((ActDispensing)actDispensing.get(j)).getAccountingNameB() + ',' + ((ActDispensing)actDispensing.get(j)).getAccountingIdB());
actDispensing.get(i).setAccountingNameC(actDispensing.get(i).getAccountingNameC()+','+actDispensing.get(i).getAccountingIdC()); ((ActDispensing)actDispensing.get(j)).setAccountingNameC(((ActDispensing)actDispensing.get(j)).getAccountingNameC() + ',' + ((ActDispensing)actDispensing.get(j)).getAccountingIdC());
actDispensings.add(actDispensing.get(i)); actDispensings.add(actDispensing.get(j));
} }
return actDispensings; return actDispensings;
} }
@Override
public List<ActDispensing> getAccountFromYon(List<ActDispensing> actDispensings) { public List<ActDispensing> getAccountFromYon(List<ActDispensing> actDispensings) {
/*JSONObject httpBody = new JSONObject(); JSONObject accSubjects = getAccSubjects();
httpBody.put("code", actDispensings.get(0).getMining()); CustomDocRequestModel docRequest = new CustomDocRequestModel();
httpBody.put("pageIndex", 1); docRequest.setPageIndex(Long.valueOf(1L));
httpBody.put("pageSize", 100000); docRequest.setPageSize(Long.valueOf(500L));
ReturnResult result = VoucherUtils.callVoucherQuery( httpBody , YFXM_URL); for (ActDispensing dispensing : actDispensings) {
JSONObject resultJsonObj = (JSONObject) result.getData().get(0); String nameZhCn = AuxiliaryAccRuleHandler.handleAuxiliaryAccounting(dispensing.getMining(), dispensing.getName());
JSONArray recordList = resultJsonObj.getJSONArray("recordList"); String displayName = AccSubjectReqParamHandler.paramHandler(dispensing.getName(), dispensing.getMaterial(), dispensing.getDepartment());
logger.info("recordList : "+ recordList.toJSONString()); JSONObject accRes = getCellByName(displayName, accSubjects);
Map<String, List<String>> resultMap = new LinkedHashMap<>(); dispensing.setAccountingCode(accRes.getString("code"));
recordList.forEach(item -> { JSONArray res = accRes.getJSONArray("res");
JSONObject object = (JSONObject) item; String dispensingDepartment = dispensing.getDepartment();
String classifyIdName = object.getString("classifyid_name"); dispensing.setAccountingNameA(null + "," + null);
String name = object.getString("name"); dispensing.setAccountingNameB(null + "," + null);
dispensing.setAccountingNameC(null + "," + null);
resultMap.computeIfAbsent(classifyIdName, k -> new ArrayList<>()).add(name); Map<String, String> mapNameCode = new HashMap<>();
});*/ for (Object jsonObject : res) {
JSONObject accObject = (JSONObject)jsonObject;
String dimensionextName = accObject.getString("dimensionext_name");
// for (int i=0;i<actDispensings.size();i++) { String dimensionextCode = accObject.getString("dimensionext_code");
// if (actDispensings.get(i).getDepartment().equals("")||actDispensings.get(i).getDepartment()==null){ String codeFromCustomDoc = null;
// if (actDispensings.get(i)!=null && actDispensings.get(i).getName() != null){ if ("物料基本分类".equals(dimensionextName)) {
// String name = actDispensings.get(i).getName(); if ("原煤".equals(dispensingDepartment)) {
// for (int t = 0; t < recordList.size(); t++) { codeFromCustomDoc = "MT01";
// JSONObject object = recordList.getJSONObject(t); } else if ("选煤".equals(dispensingDepartment)) {
// if (name.equals(object.getString("classifyid_name"))){ codeFromCustomDoc = "MT03";
//// actDispensings.get(i).setAccountingCode(object.getString()); } else if ("选混煤".equals(dispensingDepartment)) {
//// actDispensings.get(i).setAccountingNameA(object.getString()); codeFromCustomDoc = "MT0303";
//// actDispensings.get(i).setAccountingNameB(object.getString()); } else if ("洗煤".equals(dispensingDepartment)) {
//// actDispensings.get(i).setAccountingNameC(object.getString()); codeFromCustomDoc = "MT02";
// } }
// } } else {
// } docRequest.setCustdocdefcode(dimensionextCode + "_yql");
// }else { JSONArray customDoc = getCustomDoc(docRequest);
// ActDispensing actDispensing = actSuppliesAccountMapper.selectActSuppliesAccpuntByName(actDispensings.get(i).getName() + '-' + actDispensings.get(i).getDepartment() + '-' + actDispensings.get(i).getMaterial()); codeFromCustomDoc = getCodeFromCustomDoc(customDoc, nameZhCn);
// if (actDispensing !=null){ }
// actDispensings.get(i).setAccountingCode(actDispensing.getAccountingCode()); mapNameCode.put(dimensionextName, codeFromCustomDoc);
// actDispensings.get(i).setAccountingNameA(actDispensing.getAccountingNameA()+','+actDispensing.getAccountingIdA()); }
// actDispensings.get(i).setAccountingNameB(actDispensing.getAccountingNameB()+','+actDispensing.getAccountingIdB()); Iterator<Map.Entry<String, String>> it = mapNameCode.entrySet().iterator();
// actDispensings.get(i).setAccountingNameC(actDispensing.getAccountingNameC()+','+actDispensing.getAccountingIdC()); if (it.hasNext()) {
// } Map.Entry<String, String> entry = it.next();
// } dispensing.setAccountingNameA((String)entry.getKey() + "," + (String)entry.getValue());
// } }
// for (int i = 0; i < recordList.size(); i++) { if (it.hasNext()) {
// JSONObject object = recordList.getJSONObject(i); Map.Entry<String, String> entry = it.next();
// dispensing.setAccountingNameB((String)entry.getKey() + "," + (String)entry.getValue());
// } }
if (it.hasNext()) {
Map.Entry<String, String> entry = it.next();
dispensing.setAccountingNameC((String)entry.getKey() + "," + (String)entry.getValue());
}
this.logger.error(dispensing.toString());
}
ActDispensing actDispensing = new ActDispensing();
actDispensing.setAccountingCode("2241005");
actDispensings.add(actDispensing);
ActDispensing actDispensing2 = new ActDispensing();
actDispensing2.setAccountingCode("1403002");
actDispensings.add(actDispensing2);
return actDispensings; return actDispensings;
} }
public JSONArray getCustomDoc(CustomDocRequestModel customDocRequestModel) {
ReturnResult customDocument = VoucherUtils.callVoucherQuery(customDocRequestModel, "/yonbip/digitalModel/customerdoc/list");
JSONObject customDocumentJsonObj = (JSONObject)JSON.toJSON(customDocument.getData().get(0));
return customDocumentJsonObj.getJSONArray("recordList");
}
public JSONObject getCellByName(String filterNameZHCN, JSONObject accSubjects) {
JSONObject cell = getAccSubject(accSubjects, filterNameZHCN);
assert cell != null;
if ("专项储备_煤炭生产安全费_本年减少_费用性支出".equals(filterNameZHCN) || "研发支出_费用化支出_材料及低值易耗品".equals(filterNameZHCN) || "在建工程_内部投资工程".equals(filterNameZHCN))
return filterBodiesWithSpecified(cell);
return filterBodiesWithExtNameEnding(cell);
}
private JSONObject getAccSubject(JSONObject accSubjects, String filterNameZHCN) {
for (String key : accSubjects.keySet()) {
JSONArray accSubject = accSubjects.getJSONArray(key);
for (Object o : accSubject) {
JSONObject cell = (JSONObject)o;
if (cell.getString("displayname").equals(filterNameZHCN))
return cell;
}
}
return null;
}
private JSONObject filterBodiesWithExtNameEnding(JSONObject cell) {
JSONArray bodies = cell.getJSONArray("bodies");
JSONArray res = new JSONArray();
String code = cell.getString("code");
if (bodies.size() > 0)
for (int i = 0; i < bodies.size(); i++) {
JSONObject body = bodies.getJSONObject(i);
String extName = body.getString("ext_name");
if (extName.endsWith("@0") || extName.contains("物料基本分类") || extName.contains("产品成本来源类别")) {
JSONObject filteredBody = new JSONObject();
filteredBody.put("dimensionext", body.getString("dimensionext"));
filteredBody.put("dimensionext_name", body.getString("dimensionext_name"));
filteredBody.put("dimensionext_code", body.getString("dimensionext_code"));
res.add(filteredBody);
}
}
JSONObject result = new JSONObject();
result.put("code", code);
result.put("res", res);
return result;
}
private JSONObject filterBodiesWithSpecified(JSONObject cell) {
JSONArray bodies = cell.getJSONArray("bodies");
JSONArray res = new JSONArray();
String code = cell.getString("code");
if (bodies.size() > 0)
for (int i = 0; i < bodies.size(); i++) {
JSONObject body = bodies.getJSONObject(i);
JSONObject filteredBody = new JSONObject();
filteredBody.put("dimensionext", body.getString("dimensionext"));
filteredBody.put("dimensionext_name", body.getString("dimensionext_name"));
filteredBody.put("dimensionext_code", body.getString("dimensionext_code"));
res.add(filteredBody);
}
JSONObject result = new JSONObject();
result.put("code", code);
result.put("res", res);
return result;
}
private String getCodeFromCustomDoc(JSONArray customDoc, String nameZhCn) {
String code = null;
for (Object o : customDoc) {
JSONObject object = (JSONObject)o;
JSONObject nameObject = object.getJSONObject("name");
String zh_CN = nameObject.getString("zh_CN");
if (zh_CN.equals(nameZhCn)) {
code = object.getString("code");
break;
}
}
return code;
}
public JSONArray getAuxiliary() {
ReturnResult accounting = VoucherUtils.invokeByGet("", "", "/yonbip/fi/fipub/multidimension_ext/getapimultidimension");
return (JSONArray)JSON.toJSON(accounting.getData());
}
public JSONObject getAccSubjects() {
ReturnResult accSubject = VoucherUtils.callVoucherQuery(REQUEST_HTTP_BODY, "/yonbip/fi/fipub/accsubject/querysubjectapi");
JSONArray jsonArray = new JSONArray(accSubject.getData());
return jsonArray
.getJSONObject(0)
.getJSONObject("accsubjectchart")
.getJSONObject("accSubjects");
}
} }
ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ItemListQueryServiceImpl.java 0 → 100644
View file @ 2d2166f5
package com.ruoyi.system.service.impl;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.ruoyi.system.common.ReturnResult;
import com.ruoyi.system.constant.ApiConstant;
import com.ruoyi.system.service.IItemListQueryService;
import com.ruoyi.system.yyinterface.VoucherUtils;
import org.springframework.stereotype.Service;
/**
* @author xyx
* @date 2024/4/22
*/
@Service
public class ItemListQueryServiceImpl implements IItemListQueryService {
@Override
public JSONArray getItemList(String sskId) {
JSONObject jsonObject = new JSONObject();
jsonObject.put("pageIndex",1L);
jsonObject.put("pageSize",1000L);
jsonObject.put("code",sskId);
ReturnResult accSubject = VoucherUtils.callVoucherQuery( jsonObject , ApiConstant.YFXM_URL);
JSONObject data = (JSONObject) accSubject.getData().get(0);
return data.getJSONArray("recordList");
}
}
ruoyi-supplies/src/main/java/com/ruoyi/system/utils/AccSubjectReqParamHandler.java 0 → 100644
View file @ 2d2166f5
package com.ruoyi.system.utils;
/**
* @author xyx
* @date 2024/4/18
*/
public class AccSubjectReqParamHandler {
/**
*
* @param name 费用来源
* @param material 物料名称
* @param department 部门名称
* @return 科目详情列表中索要查找的 name: ZH_CN
*/
public static String paramHandler(String name, String material, String department) {
switch (name) {
case "基本生产":
return "基本生产_直接材料_" + material;
case "制造费用":
case "销售费用":
return name + "_材料及低值易耗品";
case "其他业务成本":
if ("其他材料".equals(material) || "运输业务".equals(material)) {
return "其他业务成本_" + department;
}
case "管理费用":
return "管理费用_管理费_材料及低值易耗品";
case "专项储备":
return "专项储备_煤炭生产安全费_本年减少_费用性支出";
case "研究费用":
return "研发支出_费用化支出_材料及低值易耗品";
case "内部投资":
return "在建工程_内部投资工程";
}
return null;
}
}
ruoyi-supplies/src/main/java/com/ruoyi/system/utils/AuxiliaryAccRuleHandler.java 0 → 100644
View file @ 2d2166f5
package com.ruoyi.system.utils;
import java.util.HashMap;
import java.util.Map;
import java.util.function.Function;
/**
* @author xyx
* @date 2024/4/18
*/
public class AuxiliaryAccRuleHandler {
private static final Map<String, Function<String, String>> AUXILIARY_ACCOUNTING_RULES = new HashMap<>();
static {
// 唐山矿 param 无论传的是什么都会返回 “非填充开采”
AUXILIARY_ACCOUNTING_RULES.put("010101", param -> "非充填开采");
// 范矿
AUXILIARY_ACCOUNTING_RULES.put("011701", param -> "非充填开采");
// 钱矿
AUXILIARY_ACCOUNTING_RULES.put("010105", param -> "非充填开采");
// 宏丰
AUXILIARY_ACCOUNTING_RULES.put("011502", param -> "非充填开采");
// 林西
AUXILIARY_ACCOUNTING_RULES.put("011704", param -> "非充填开采");
// 单侯
AUXILIARY_ACCOUNTING_RULES.put("011204", param -> "非充填开采");
// 吕矿
AUXILIARY_ACCOUNTING_RULES.put("011702", param -> {
if ("基本生产".equals(param) || "制造费用".equals(param)) {
return "非充填开采";
} else if ("管理费用".equals(param) || "销售费用".equals(param)) {
return null;
}
return null;
});
// 东欢陀
AUXILIARY_ACCOUNTING_RULES.put("010102", param -> {
if ("基本生产".equals(param) || "制造费用".equals(param)){
return "非充填开采";
} else if ("管理费用".equals(param)) {
return "部门_机关";
} else if ("其他业务成本_运输业务".equals(param)){
return "其他业务支出费用要素_通用材料/油类";
}
return null;
});
}
/**
*
* @param sskId 矿id
* @param param 费用来源 [ 基本生产, 制造费用, 管理费用, 销售费用, 其他业务成本_运输业务 ]
* @return 自定义档案 name: ZH_CN
*/
public static String handleAuxiliaryAccounting(String sskId, String param) {
return AUXILIARY_ACCOUNTING_RULES.getOrDefault(sskId, p -> null).apply(param);
}
}
ruoyi-supplies/src/main/java/com/ruoyi/system/yyinterface/VoucherUtils.java
View file @ 2d2166f5
/*
package com.ruoyi.system.yyinterface; package com.ruoyi.system.yyinterface;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
...@@ -14,13 +13,10 @@ import java.util.Date; ...@@ -14,13 +13,10 @@ import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
*/
/** /**
* @Author jiuli * @Author jiuli
* @Date 2024/1/16 * @Date 2024/1/16
*//* */
public class VoucherUtils { public class VoucherUtils {
private static final Logger logger = LoggerFactory.getLogger(VoucherUtils.class); private static final Logger logger = LoggerFactory.getLogger(VoucherUtils.class);
...@@ -67,4 +63,3 @@ public class VoucherUtils { ...@@ -67,4 +63,3 @@ public class VoucherUtils {
return output.format(date); return output.format(date);
} }
} }
*/
ruoyi-supplies/src/main/resources/mapper/system/ActSuppliesCleaningRuleMapper.xml
View file @ 2d2166f5
...@@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<select id="selectActSuppliesCleaningCopy" parameterType="Long" resultMap="ActSuppliesImportCleaningResultAcc"> <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 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> </select>
......
ruoyi-supplies/src/main/resources/mapper/system/ActSuppliesHistorydataMapper.xml
View file @ 2d2166f5
...@@ -49,10 +49,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -49,10 +49,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectActSuppliesHistorydataCopyList" parameterType="ActSuppliesHistorydata" resultMap="ActSuppliesHistorydataResult"> <select id="selectActSuppliesHistorydataCopyList" parameterType="ActSuppliesHistorydata" resultMap="ActSuppliesHistorydataResult">
<!--<include refid="selectActSuppliesHistorydataVo"/>--> <!--<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, t1.date 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, t1.date,t1.ssk_id
FROM act_supplies_historydata_copy1 t1 FROM act_supplies_historydata_copy1 t1
LEFT JOIN act_supplies_template t2 ON t1.template_id = t2.id LEFT JOIN act_supplies_template t2 ON t1.template_id = t2.id
<where> <where>
<if test="createBy!= 'admin'" >and t1.create_by = #{createBy}</if>
<if test="templateName != null and templateName != ''"> and t2.template_name like concat('%', #{templateName}, '%')</if> <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="historyName != null and historyName != ''"> and history_name like concat('%', #{historyName}, '%')</if>
<if test="identifyingCode != null "> and identifying_code = #{identifyingCode}</if> <if test="identifyingCode != null "> and identifying_code = #{identifyingCode}</if>
......
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