diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java index ae1d10b2e..55fe92bc8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java @@ -1271,21 +1271,21 @@ public class WordUtil { text = "Final"; } - for (String value : itemText.split(",")) { String blank = getBlank(value); - if (text.contains(value)) { - if (text.equals("if fitted") && value.equals("Mandatory")) { - sb.append("□" + value + blank); - } else { - //将错误的英文转为正确的 - String value1 = scopeConvert(value); + if(StringUtils.isNotEmpty(text)){ + int count = 0 ; + for (String s : text.split(",")) { + if(s.equals(value)){ + count ++; + } + } + String value1 = scopeConvert(value); + if(count == 0){ + sb.append("□" + value1 + blank); + }else{ sb.append("■" + value1 + blank); } - - } else { - String value1 = scopeConvert(value); - sb.append("□" + value1 + blank); } } String[] split = sb.toString().split("\r\n"); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/FileSplitItemsEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/FileSplitItemsEOMapper.java index a7051d77c..a970cf2ab 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/FileSplitItemsEOMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/FileSplitItemsEOMapper.java @@ -40,9 +40,17 @@ public interface FileSplitItemsEOMapper extends BaseMapper * @param condition * @return */ - List> getInfoList(@Param("field") String field, + List getInfoList(@Param("field") String field, @Param("condition") String condition); + /** + * 根据条件查询总数 + * @param + * @param condition + * @return + */ + Integer getInfoCount(@Param("condition") String condition); + /** * 根据id查询 * @param value @@ -69,4 +77,6 @@ public interface FileSplitItemsEOMapper extends BaseMapper int insertForeach(List list); List selectByInfoId(String value); + + void updateSarFileSplitItemsInfo(@Param("sarFileSplitItemsEO") SarFileSplitItemsEO sarFileSplitItemsEO); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/FileSplitItemsEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/FileSplitItemsEOMapper.xml index b1dc4e2b1..083d419c6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/FileSplitItemsEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/FileSplitItemsEOMapper.xml @@ -16,12 +16,19 @@ - select ${field} from sar_file_split_items ${condition} + + + + + + update sar_file_split_items + + + zhan3_shi4_shun4_xu4 = #{sarFileSplitItemsEO.zhan3Shi4Shun4Xu4}, + + modify_user = #{sarFileSplitItemsEO.modifyUser, jdbcType=VARCHAR}, + modify_time = #{sarFileSplitItemsEO.modifyTime, jdbcType=TIMESTAMP} + + where id = #{sarFileSplitItemsEO.id, jdbcType=VARCHAR} + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java index 761fb4294..c69175bd9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java @@ -198,6 +198,11 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl parameter) { + Map copyParameter = new HashMap<>(); + for (Map.Entry entry : parameter.entrySet()) { + copyParameter.put(entry.getKey(),entry.getValue()); + } + this.setEditZhan3Shi4Shun4Xu4(copyParameter); List itemValEOList = (List) parameter.get("itemValEOList"); List getValList = new ArrayList<>(); for(Object object : itemValEOList) { @@ -437,6 +442,55 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl parameter){ + String id = (String) parameter.get("id"); + String info_id = (String) parameter.get("info_id"); + Integer inputOrderNum = (Integer) parameter.get("zhan3_shi4_shun4_xu4"); + if(inputOrderNum > 0){ + String field = "id,items_num,items_name,zhan3_shi4_shun4_xu4"; + String condition = " where info_id = '" + info_id + "' order by zhan3_shi4_shun4_xu4 asc"; + List splitItems = this.dao.getInfoList(field, condition); + List updateList = new ArrayList<>(); + + if(CollectionUtils.isNotEmpty(splitItems)){ + Double zhan3Shi4Shun4Xu4 = Double.valueOf(splitItems.stream().filter(e -> StringUtils.equals(e.getId(), id)) + .map(e -> e.getZhan3Shi4Shun4Xu4()).collect(Collectors.toList()).get(0)); + Integer orderNumData = zhan3Shi4Shun4Xu4.intValue(); + + + Integer infoCount = this.dao.getInfoCount(" where info_id = '" + info_id + "' and zhan3_shi4_shun4_xu4 = " + inputOrderNum); + //有重复展示顺序的,后面的号全+1 + if (infoCount > 0 && !orderNumData.equals(inputOrderNum)) { + // 设置排序 + String geField = "id,items_num,items_name,zhan3_shi4_shun4_xu4"; + String geCondition = " where info_id = '" + info_id + "' and zhan3_shi4_shun4_xu4 >= " + inputOrderNum + " order by zhan3_shi4_shun4_xu4 asc "; + List geSplitItems = this.dao.getInfoList(geField, geCondition); + + if(CollectionUtils.isNotEmpty(geSplitItems)){ + for (int i = 0; i < geSplitItems.size(); i++) { + updateList.add(geSplitItems.get(i)); + } + } + } + } + + if(CollectionUtils.isNotEmpty(updateList)){ + LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + for (SarFileSplitItemsEO sarFileSplitItemsEO : updateList) { + int zhan3Shi4Shun4Xu4 = Double.valueOf(sarFileSplitItemsEO.getZhan3Shi4Shun4Xu4()).intValue() + 1; + sarFileSplitItemsEO.setZhan3Shi4Shun4Xu4(String.valueOf(zhan3Shi4Shun4Xu4)); + sarFileSplitItemsEO.setModifyTime(new Date()); + sarFileSplitItemsEO.setModifyUser(currentUser.getUsername()); + this.dao.updateSarFileSplitItemsInfo(sarFileSplitItemsEO); + } + } + } + } + private String getMustValues(String id) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();