xiaoning
/
gj_erp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1019文档需求3

Browse Source
master
xiezuo003 2 years ago
parent 4cd75d1510
commit 0f697c82cb
4 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File

21
.idea/workspace.xml
Unescape View File

@ -6,17 +6,9 @@
<component name="ChangeListManager">
<list default="true" id="a2c22d75-c3b6-48b6-93b4-6a3444d9a247" name="Default Changelist" comment="1019文档需求">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbcnp.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbcnp.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbrydyp.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbrydyp.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/SYController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/SYController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/jcsj/EmSbjbbController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/jcsj/EmSbjbbController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/jhgk/DmXbjhController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/jhgk/DmXbjhController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/dao/jcsj/EmSbjbbRepository.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/dao/jcsj/EmSbjbbRepository.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jcsj/EmSbjbbService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jcsj/EmSbjbbService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbjbbServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbjbbServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/DmXbjhService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/DmXbjhService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmXbjhServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmXbjhServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/util/ExcelUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/util/ExcelUtil.java" afterDir="false" />
</list>
<list id="1843e6b0-3c18-45b6-89c7-e9efbe3d4674" name="Revert &quot;finish&quot;" comment="Revert &quot;finish&quot;" />
<list id="4d943a56-b745-4db0-8fd5-bbd1f49b8f76" name="Revert &quot;finish&quot;-2" comment="Revert &quot;finish&quot;&#10;&#10;This reverts commit e413da9b" />
@ -93,17 +85,6 @@
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
<option name="arquillianRunConfiguration">
<value>
<option name="containerStateName" value="" />
</value>
</option>
<option name="TEST_OBJECT" value="class" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="GjErpApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<module name="gj_erp" />
<option name="SPRING_BOOT_MAIN_CLASS" value="com.dsic.gj_erp.GjErpApplication" />
@ -150,6 +131,8 @@
<workItem from="1697852420526" duration="5738000" />
<workItem from="1697871559613" duration="9557000" />
<workItem from="1697940710591" duration="5807000" />
<workItem from="1698025517542" duration="2101000" />
<workItem from="1698135831323" duration="3744000" />
</task>
<task id="LOCAL-00001" summary="finish">
<created>1695345779307</created>

5
src/main/java/com/dsic/gj_erp/controller/jhgk/DmXbjhController.java
Unescape View File

@ -15,6 +15,7 @@ import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
import java.util.List;
import java.util.Map;
/**
* <p>
@ -34,7 +35,7 @@ public class DmXbjhController {
@ApiOperation(value = "查询")
@PostMapping(value = "/getList")
public ResultBean getList(@RequestBody JSONObject json) {
List<DmXbjh> dmXbjhs= dmXbjhService.getList(json);
Map<String,List<DmXbjh>> dmXbjhs= dmXbjhService.getList(json);
return new ResultBean(dmXbjhs);
}
@ -47,7 +48,7 @@ public class DmXbjhController {
@ApiOperation(value = "批量保存")
@PostMapping(value = "/save")
public ResultBean save(@RequestBody List<DmXbjh> dmXbjhs) {
public ResultBean save(@RequestBody JSONObject dmXbjhs) {
dmXbjhService.save(dmXbjhs);
return new ResultBean();
}

5
src/main/java/com/dsic/gj_erp/service/jhgk/DmXbjhService.java
Unescape View File

@ -7,6 +7,7 @@ import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
import java.util.List;
import java.util.Map;
/**
* <p>
@ -17,11 +18,11 @@ import java.util.List;
* @since 2023-09-15
*/
public interface DmXbjhService extends IService<DmXbjh> {
List<DmXbjh> getList(JSONObject json);
Map<String,List<DmXbjh>> getList(JSONObject json);
JSONObject upload(MultipartFile file) throws IOException;
void save(List<DmXbjh> dmXbjhs);
void save(JSONObject dmXbjhs);
void tj(List<DmXbjh> dmXbjhs);
}

19
src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmXbjhServiceImpl.java
Unescape View File

@ -1,6 +1,7 @@
package com.dsic.gj_erp.service.jhgk.impl;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@ -18,6 +19,7 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* <p>
@ -35,7 +37,7 @@ public class DmXbjhServiceImpl extends ServiceImpl<DmXbjhMapper, DmXbjh> impleme
ModelMapper modelMapper;
@Override
public List<DmXbjh> getList(JSONObject json) {
public Map<String,List<DmXbjh>> getList(JSONObject json) {
QueryWrapper<DmXbjh> queryWrapper=new QueryWrapper<>();
if(StringUtils.isNotEmpty(json.getString("dcCh"))){
queryWrapper.eq("dc_ch",json.getString("dcCh"));
@ -51,7 +53,8 @@ public class DmXbjhServiceImpl extends ServiceImpl<DmXbjhMapper, DmXbjh> impleme
queryWrapper.lt("nf",endTime);
}
List<DmXbjh> dmTzjhs=dmXbjhMapper.selectList(queryWrapper);
return dmTzjhs;
Map<String,List<DmXbjh>> map=dmTzjhs.stream().collect(Collectors.groupingBy(DmXbjh::getDcCh));
return map;
}
@Override
@ -69,7 +72,17 @@ public class DmXbjhServiceImpl extends ServiceImpl<DmXbjhMapper, DmXbjh> impleme
}
@Override
public void save(List<DmXbjh> dmXbjhs) {
public void save(JSONObject json) {
List<DmXbjh> dmXbjhs=new ArrayList<>();
for (String key:json.keySet()) {
JSONArray jsonArray=json.getJSONArray(key);
for (Object object:jsonArray) {
// JSONObject dmxb=JSONObject.parseObject(object.toString());
DmXbjh dmXbjh= modelMapper.map(object,DmXbjh.class);
dmXbjh.setDcCh(key);
dmXbjhs.add(dmXbjh);
}
}
saveBatch(dmXbjhs);
}

Write Preview
Loading…
Cancel
Save