| | |
|---|
| | | import com.alibaba.fastjson.JSONArray; |
|---|
| | | import com.alibaba.fastjson.JSONObject; |
|---|
| | | import com.baomidou.dynamic.datasource.annotation.DS; |
|---|
| | | import com.example.erp.dto.pp.ReworkDTO; |
|---|
| | | import com.example.erp.entity.pp.BasicDataProduce; |
|---|
| | | import com.example.erp.entity.pp.FlowCard; |
|---|
| | | import com.example.erp.entity.pp.PatchLog; |
|---|
| | |
|---|
| | | for (Map<String, Object> item : ReworkMap) { |
|---|
| | | item.put("reworkTeam", ""); |
|---|
| | | List<BasicDataProduce> basicCategory = new ArrayList<>(); |
|---|
| | | |
|---|
| | | List<BasicDataProduce> basicDataProduceList = basicDateProduceMapper.SelectWorkBasicTeams(item.get("reworkProcesses").toString()); |
|---|
| | | for (BasicDataProduce basicDataProduce : basicDataProduceList) { |
|---|
| | | if (Objects.equals(basicDataProduce.getBasicData().getBasicName(), item.get("reworkProcesses"))) { |
|---|
| | |
|---|
| | | return listMap; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Map<String, Object> SelectRework(Integer pageNum, Integer pageSize, List<String> selectDate, Rework rework) { |
|---|
| | | public Map<String, Object> SelectRework(Integer pageNum, Integer pageSize, List<String> selectDate, ReworkDTO rework) { |
|---|
| | | Integer offset = (pageNum - 1) * pageSize; |
|---|
| | | String endDate = LocalDate.now().toString(); |
|---|
| | | String startDate = LocalDate.now().minusDays(15).toString(); |
|---|
| | |
|---|
| | | boolean saveState = true; |
|---|
| | | Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint(); |
|---|
| | | try { |
|---|
| | | System.out.println(111111); |
|---|
| | | //获取对象集合循环进行新增修改 |
|---|
| | | List<Rework> reworklist = JSONArray.parseArray(JSONObject.toJSONString(object.get("rework")), Rework.class); |
|---|
| | | if (!reworklist.isEmpty()){ |
|---|
