1

ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/service/impl/PdmConstructTeamServiceImpl.java

@@ -64,17 +64,26 @@ public class PdmConstructTeamServiceImpl implements IPdmConstructTeamService
      * @return 结果
      */
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public int insertPdmConstructTeam(PdmConstructTeamVo pdmConstructTeam)
     {
         String teamNo= IdUtils.fastSimpleUUID();
         pdmConstructTeam.setCreateTime(DateUtils.getNowDate());
         pdmConstructTeam.setCreateBy(SecurityUtils.getUsername());
         pdmConstructTeam.setTeamNo(teamNo);
-        pdmConstructTeam.getConstructorList().forEach(constructor->{
+        for(PdmConstructor constructor:pdmConstructTeam.getConstructorList()){
             constructor.setTeamNo(teamNo);
+            constructor.setCreateTime(DateUtils.getNowDate());
+            constructor.setCreateBy(SecurityUtils.getUsername());
             pdmConstructorMapper.insertPdmConstructor(constructor);
-        });
+        }
+//        pdmConstructTeam.getConstructorList().forEach(constructor->{
+//            constructor.setTeamNo(teamNo);
+//            try {
+//                pdmConstructorMapper.insertPdmConstructor(constructor);
+//            }catch(Exception e){
+//                e.printStackTrace();
+//            }
+//        });
         return pdmConstructTeamMapper.insertPdmConstructTeam(pdmConstructTeam);
     }
 
@@ -85,15 +94,18 @@ public class PdmConstructTeamServiceImpl implements IPdmConstructTeamService
      * @return 结果
      */
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public int updatePdmConstructTeam(PdmConstructTeamVo pdmConstructTeam)
     {
         pdmConstructTeam.setUpdateTime(DateUtils.getNowDate());
         pdmConstructTeam.setUpdateBy(SecurityUtils.getUsername());
         pdmConstructTeam.getConstructorList().forEach(constructor->{
            if(pdmConstructorMapper.updatePdmConstructor(constructor)<1){
-               constructor.setTeamNo(pdmConstructTeam.getTeamNo());
-               pdmConstructorMapper.insertPdmConstructor(constructor);
+               try {
+                   constructor.setTeamNo(pdmConstructTeam.getTeamNo());
+                   pdmConstructorMapper.insertPdmConstructor(constructor);
+               }catch (Exception eception){
+                   eception.printStackTrace();
+               }
            };
         });
         return pdmConstructTeamMapper.updatePdmConstructTeam(pdmConstructTeam);
@@ -127,7 +139,6 @@ public class PdmConstructTeamServiceImpl implements IPdmConstructTeamService
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public void importExcel(List<ConstructTeam> constructTeamList) {
         Map<String,PdmConstructTeamVo> data=new HashMap<>();
         for (ConstructTeam constructTeam : constructTeamList) {

ruoyi-powerdistribution/src/main/resources/mapper/powerdistribution/PdmConstructTeamMapper.xml

@@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="teamLeaderPhone != null  and teamLeaderPhone != ''"> and team_leader_phone = #{teamLeaderPhone}</if>
             <if test="arrestPoint != null  and arrestPoint != ''"> and arrest_point = #{arrestPoint}</if>
         </where>
-        order by team_serial_no
+        order by county_org_nm,team_nm,team_serial_no asc
     </select>
     
     <select id="selectPdmConstructTeamById" parameterType="Long" resultMap="PdmConstructTeamResult">