Skip to content

T
tianjin-cement
Commit 56687824 authored by 竹天卫's avatar 竹天卫
Browse files
Options

滴定度存入历史值

parent 6c1fa63a
Show whitespace changes
Inline Side-by-side
Showing with 28 additions and 118 deletions
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/CommonServiceImpl.java
View file @ 56687824
......@@ -204,59 +204,59 @@ public class CommonServiceImpl {
}
}
if(jsonObjectGroup.containsKey("TSiO<sub>2</sub>")){
if(jsonObjectGroup.get("name").equals("TSiO<sub>2</sub>")){
if(map.containsKey("TSiO<sub>2</sub>")){
jsonObjectGroup.put("TSiO<sub>2</sub>",map.get("TSiO<sub>2</sub>"));
jsonObjectGroup.put("value",map.get("TSiO<sub>2</sub>"));
}
}
if(jsonObjectGroup.containsKey("TAl<sub>2</sub>O<sub>3</sub>")){
if(jsonObjectGroup.get("name").equals("TAl<sub>2</sub>O<sub>3</sub>")){
if(map.containsKey("TAl<sub>2</sub>O<sub>3</sub>")){
jsonObjectGroup.put("TAl<sub>2</sub>O<sub>3</sub>",map.get("TAl<sub>2</sub>O<sub>3</sub>"));
jsonObjectGroup.put("value",map.get("TAl<sub>2</sub>O<sub>3</sub>"));
}
}
if(jsonObjectGroup.containsKey("TFe<sub>2</sub>O<sub>3</sub>")){
if(jsonObjectGroup.get("name").equals("TFe<sub>2</sub>O<sub>3</sub>")){
if(map.containsKey("TFe<sub>2</sub>O<sub>3</sub>")){
jsonObjectGroup.put("TFe<sub>2</sub>O<sub>3</sub>",map.get("TFe<sub>2</sub>O<sub>3</sub>"));
jsonObjectGroup.put("value",map.get("TFe<sub>2</sub>O<sub>3</sub>"));
}
}
if(jsonObjectGroup.containsKey("TMgO")){
if(jsonObjectGroup.get("name").equals("TMgO")){
if(map.containsKey("TMgO")){
jsonObjectGroup.put("TMgO",map.get("TMgO"));
jsonObjectGroup.put("value",map.get("TMgO"));
}
}
if(jsonObjectGroup.containsKey("TTiO<sub>2</sub>")){
if(jsonObjectGroup.get("name").equals("TTiO<sub>2</sub>")){
if(map.containsKey("TTiO<sub>2</sub>")){
jsonObjectGroup.put("TTiO<sub>2</sub>",map.get("TTiO<sub>2</sub>"));
jsonObjectGroup.put("value",map.get("TTiO<sub>2</sub>"));
}
}
if(jsonObjectGroup.containsKey("TAl<sub>2</sub>O<sub>3</sub>")){
if(jsonObjectGroup.get("name").equals("TAl<sub>2</sub>O<sub>3</sub>")){
if(map.containsKey("TAl<sub>2</sub>O<sub>3</sub>")){
jsonObjectGroup.put("TAl<sub>2</sub>O<sub>3</sub>",map.get("TAl<sub>2</sub>O<sub>3</sub>"));
jsonObjectGroup.put("value",map.get("TAl<sub>2</sub>O<sub>3</sub>"));
}
}
if(jsonObjectGroup.containsKey("TTiO<sub>2</sub>")){
if(jsonObjectGroup.get("name").equals("TTiO<sub>2</sub>")){
if(map.containsKey("TTiO<sub>2</sub>")){
jsonObjectGroup.put("TTiO<sub>2</sub>",map.get("TTiO<sub>2</sub>"));
jsonObjectGroup.put("value",map.get("TTiO<sub>2</sub>"));
}
}
if(jsonObjectGroup.containsKey("TCaO")){
if(jsonObjectGroup.get("name").equals("TCaO")){
if(map.containsKey("TCaO")){
jsonObjectGroup.put("TCaO",map.get("TCaO"));
jsonObjectGroup.put("value",map.get("TCaO"));
}
}
if(jsonObjectGroup.containsKey("V1")){
if(jsonObjectGroup.get("name").equals("V1")){
if(map.containsKey("V1")){
jsonObjectGroup.put("V1",map.get("V1"));
jsonObjectGroup.put("value",map.get("V1"));
}
}
if(jsonObjectGroup.containsKey("T")){
if(jsonObjectGroup.get("name").equals("T")){
if(map.containsKey("T")){
jsonObjectGroup.put("T",map.get("T"));
jsonObjectGroup.put("value",map.get("T"));
}
}
if(jsonObjectGroup.containsKey("K")){
if(jsonObjectGroup.get("name").equals("K")){
if(map.containsKey("K")){
jsonObjectGroup.put("K",map.get("K"));
jsonObjectGroup.put("value",map.get("K"));
}
}
}
......
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/DataStatisticsServiceImpl.java
View file @ 56687824
......@@ -366,101 +366,11 @@ public class DataStatisticsServiceImpl implements IDataStatisticsService {
*/
public void exportEntrustIngList(Integer cycle, String startDate,
String endDate, Integer clientId, String clientName, String fileName, HttpServletResponse response){
Map<String, Object> params = new HashMap<>();
params.put("cycle", cycle);
params.put("startDate", startDate);
params.put("endDate", endDate);
params.put("clientId", clientId);
params.put("clientName", clientName);
List<Map<String, Object>> list = dataStatisticsMapper.exportEntrustList(params);
List<String> teamNameList = teamMapper.getNameList();
if(teamNameList ==null || teamNameList.size()<=0){
return;
}
if (!CollectionUtils.isEmpty(list)) {
String[] headers = new String[12];
headers[0] = "序号";
headers[1] = "委托单号";
headers[2] = "项目名称";
headers[3] = "项目编号";
headers[4] = "项目类型";
headers[5] = "委托人";
headers[6] = "委托单位";
headers[7] = "委托日期";
headers[8] = "样品数量";
headers[9] = "检测项目";
headers[10] = "产值";
headers[11] = "状态";
for(int i=0; i<teamNameList.size(); i++){
headers[12+i] = teamNameList.get(i);
}
List<Object[]> datas = new ArrayList<>(list.size());
for (Map<String, Object> m : list) {
Object[] objects = new Object[headers.length];
String objj = m.get("entrustId").toString();
Integer entrustId = Integer.valueOf(objj);
//只统计主样的信息
List<Sample> sampleList = sampleMapper.getSampleList(entrustId);
//检测项目名称
List<Integer> teamIdList = new ArrayList<>();
Map<String, Integer> teamMap = new HashMap<>();
//所有样品主样的产值
BigDecimal outputValue = new BigDecimal("0.00");
if (sampleList != null && sampleList.size() > 0) {
//样品名称 列表中的拼接
for (Sample sample : sampleList) {
if(sample.getOutputValue() != null){
outputValue = outputValue.compareTo(BigDecimal.ZERO) == 0 ?
sample.getOutputValue() : (outputValue.add(sample.getOutputValue()));
}
String teamIds = sample.getTeamIds();
String checkTeam = "";
if (teamIds != null) {
String[] teamIdS = teamIds.split("、");
for (String teamId : teamIdS) {
Team team = teamMapper.selectById(Integer.valueOf(teamId));
if (team != null) {
if(!teamIdList.contains(team.getId())){
teamMap.put(team.getName(), 1);
teamIdList.add(team.getId());
}else{
teamMap.put(team.getName(), teamMap.get(team.getName())+1);
}
checkTeam = checkTeam.equals("") ? team.getName() : (checkTeam + "、" + team.getName());
}
}
}
}
}
// JSONArray checkElementArray = mapToJSONArray(teamMap);
// String teamString = JSON.toJSON(checkElementArray).toString();
for (int j = 0; j < headers.length; j++) {
String obj = "";
if(j == 9){
objects[9] = teamMap;
}else if(j == 10){
objects[10] = outputValue;
}else{
obj = m.get(headers[j]).toString();
if (j == 0) {
obj = obj.split("\\.")[0];
}
objects[j] = obj;
}
}
datas.add(objects);
}
ExcelUtil.excelExport(
fileName == null || fileName.trim().length() <= 0 ? "委托单进展统计-列表导出" : fileName, headers,
datas, response);
}
//1.获取委托可见的所有检测项list
List<Team> teams =null;
//2. 获取委托列表
//3. 样品列表
//4. 检测项列表
}
......
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