解决调度员为空的问题，解决基础资料司机、车队的删除问题

ruoyi-fleet/src/main/java/com/ruoyi/basicData/service/impl/FleetCompanyMsgServiceImpl.java

@@ -114,9 +114,11 @@ public class FleetCompanyMsgServiceImpl implements IFleetCompanyMsgService {
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                 return AjaxResult.error("未找到用户信息，请添加后再提交");
             }
+            sysUser.setUserSystem("2");
             sysUser.setUpdateTime(new Date());
-            sysUser.setUpdateBy(SecurityUtils.getUsername());
             sysUser.setPhonenumber(tCorps.getfTel());
+            sysUser.setUpdateBy(SecurityUtils.getUsername());
+            sysUser.setPassword(SecurityUtils.encryptPassword(tCorps.getfTel()));
             sysUserMapper.updateUser(sysUser);
             return AjaxResult.success();
         } else {
@@ -137,12 +139,14 @@ public class FleetCompanyMsgServiceImpl implements IFleetCompanyMsgService {
     public AjaxResult createUser(TCorps tCorps) {
         // 创建用户
         SysUser user = new SysUser();
+        user.setStatus("1");
         user.setUserType("00");
+        user.setUserSystem("2");
         user.setCreateTime(new Date());
-        user.setCreateBy(SecurityUtils.getUsername());
         user.setNickName(tCorps.getfTel());
-        user.setUserName(tCorps.getLoginAccount());
         user.setPhonenumber(tCorps.getfTel());
+        user.setUserName(tCorps.getLoginAccount());
+        user.setCreateBy(SecurityUtils.getUsername());
         user.setPassword(SecurityUtils.encryptPassword(tCorps.getfTel()));
         sysUserMapper.insertUser(user);
         // 查询是否存在车队 角色
@@ -184,6 +188,7 @@ public class FleetCompanyMsgServiceImpl implements IFleetCompanyMsgService {
     public AjaxResult deleteFleetCompanyMsgByIds(Long[] ids) {
         int i = 1;
         for(Long id:ids){
+            TCorps corps = tCorpsMapper.selectTCorpsById(id);
             Ftmsorderbillsplans ftmsorderbillsplans =new Ftmsorderbillsplans();
             ftmsorderbillsplans.setCarcorPid(id);
             if(ftmsorderbillsplansMapper.selectftmsorderbillsplansCountList(ftmsorderbillsplans) > 0){
@@ -191,6 +196,9 @@ public class FleetCompanyMsgServiceImpl implements IFleetCompanyMsgService {
                 return AjaxResult.error("客户第" + i + "行调度安排已被使用不可删除");
             }
             tCorpsMapper.deleteTCorpsById(id);
+            SysUser sysUser = sysUserMapper.selectUserByUserName(corps.getLoginAccount());
+            sysUserMapper.deleteUserById(sysUser.getUserId());
+            sysUserRoleMapper.deleteUserRoleByUserId(sysUser.getUserId());
             i++;
         }
         return AjaxResult.success();
@@ -204,6 +212,10 @@ public class FleetCompanyMsgServiceImpl implements IFleetCompanyMsgService {
      */
     @Override
     public int deleteFleetCompanyMsgById(Long id) {
+        TCorps corps = tCorpsMapper.selectTCorpsById(id);
+        SysUser sysUser = sysUserMapper.selectUserByUserName(corps.getfTel());
+        sysUserMapper.deleteUserById(sysUser.getUserId());
+        sysUserRoleMapper.deleteUserRoleByUserId(sysUser.getUserId());
         return tCorpsMapper.deleteTCorpsById(id);
     }
 

ruoyi-fleet/src/main/java/com/ruoyi/basicData/service/impl/FleetDriverMsgServiceImpl.java

@@ -125,15 +125,21 @@ public class FleetDriverMsgServiceImpl implements IFleetDriverMsgService {
             if (StringUtils.isNotNull(user)) {
                 // 该用户提前关注小程序了
                 user.setRelatedNo("T");
+                user.setUserSystem("2");
                 user.setNickName(tCorps.getfName());
                 user.setUpdateTime(new Date());
+                user.setStatus("1");
                 user.setUpdateBy(SecurityUtils.getUsername());
+                user.setPassword(SecurityUtils.encryptPassword(tCorps.getfTel()));
                 userMapper.updateUser(user);
                 userId = user.getUserId();
             } else {
                 // 添加用户表
                 SysUser use = new SysUser();
+                use.setUserSystem("2");
+                use.setStatus("1");
                 use.setUserName(tCorps.getfTel());
+                use.setNickName(tCorps.getfTel());
                 use.setPhonenumber(tCorps.getfTel());
                 //sysUser.setEmail(fleetDriverMsg.get);
                 use.setUserType("11");
@@ -212,14 +218,17 @@ public class FleetDriverMsgServiceImpl implements IFleetDriverMsgService {
         int line = 0;
         for (Long id : ids) {
             line++;
-            FleetDriverMsg fleetDriverMsg = fleetDriverMsgMapper.selectFleetDriverMsgById(id);
+            TCorps corps = corpsMapper.selectTCorpsById(id);
             Ftmsorderbillscars ftmsorderbillscars = new Ftmsorderbillscars();
-            ftmsorderbillscars.setDriverTel(fleetDriverMsg.getTel());
-            ftmsorderbillscars.setDriverName(fleetDriverMsg.getName());
+            ftmsorderbillscars.setDriverTel(corps.getfTel());
+            ftmsorderbillscars.setDriverName(corps.getfName());
             if (ftmsorderbillscarsMapper.selectftmsorderbillscarsCount(ftmsorderbillscars) > 0) {
                 return AjaxResult.error("第" + line + "行数据已被使用无法删除");
             }
             corpsMapper.deleteTCorpsById(id);
+            SysUser sysUser = userMapper.selectUserByUserName(corps.getfTel());
+            userMapper.deleteUserById(sysUser.getUserId());
+            userRoleMapper.deleteUserRoleByUserId(sysUser.getUserId());
         }
         return AjaxResult.success();
     }
@@ -233,7 +242,11 @@ public class FleetDriverMsgServiceImpl implements IFleetDriverMsgService {
     @Override
     @Transactional
     public int deleteFleetDriverMsgById(Long id) {
-        return fleetDriverMsgMapper.deleteFleetDriverMsgById(id);
+        TCorps corps = corpsMapper.selectTCorpsById(id);
+        SysUser sysUser = userMapper.selectUserByUserName(corps.getfTel());
+        userMapper.deleteUserById(sysUser.getUserId());
+        userRoleMapper.deleteUserRoleByUserId(sysUser.getUserId());
+        return corpsMapper.deleteTCorpsById(id);
     }
 
     /**

ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/service/impl/FtmsorderbillsServiceImpl.java

@@ -251,6 +251,10 @@ public class FtmsorderbillsServiceImpl implements IftmsorderbillsService {
             if (StringUtils.isNotEmpty(status)) {
                 return AjaxResult.error(status);
             }
+            if (StringUtils.isNotEmpty(plans) && !"[]".equals(plans)) {
+                tmsorderbills.setPlanUserId(loginUser.getUser().getUserId());
+                tmsorderbills.setPlanUserName(loginUser.getUser().getNickName());
+            }
         }
         tmsorderbills.setActId(1000L);
         if (StringUtils.isEmpty(tmsorderbills.getBillNo())) {
@@ -403,12 +407,6 @@ public class FtmsorderbillsServiceImpl implements IftmsorderbillsService {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return AjaxResult.error("更新备份信息失败，若多次出现请联系管理员");
         }
-        tmsorderbills.setUpdateTime(new Date());
-        tmsorderbills.setUpdateBy(loginUser.getUsername());
-        if (ftmsorderbillsMapper.updateftmsorderbills(tmsorderbills) <= 0) {
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            return AjaxResult.error("更新计划失败，若多次出现请联系管理员");
-        }
         ftmsorderbillsfeesMapper.deleteFTmsorderbillsfeesByPId(pId);
         ftmsorderbillscntrsMapper.deleteftmsorderbillscntrsByPId(pId);
         ftmsorderbillsplansMapper.deleteftmsorderbillsplansByOrgId(pId);
@@ -427,22 +425,26 @@ public class FtmsorderbillsServiceImpl implements IftmsorderbillsService {
                 return AjaxResult.error("更新货量数据失败，若多次失败请联系管理员");
             }
         }
-        JSONArray planJson = JSONArray.parseArray(plans);
-        List<Ftmsorderbillsplans> tmsorderbillsplansList = JSONObject.parseArray(planJson.toJSONString(), Ftmsorderbillsplans.class);
-        int line = 0;
-        boolean status = false;
-        for (Ftmsorderbillsplans p : tmsorderbillsplansList) {
-            line++;
-            for (Ftmsorderbillscntrs cntr : tmsorderbillscntrsList) {
-                if (p.getCntrId().equals(cntr.getCntrId())) {
-                    status = true;
-                    break;
+        if (StringUtils.isNotEmpty(plans) && !"{}".equals(plans)) {
+            JSONArray planJson = JSONArray.parseArray(plans);
+            List<Ftmsorderbillsplans> tmsorderbillsplansList = JSONObject.parseArray(planJson.toJSONString(), Ftmsorderbillsplans.class);
+            int line = 0;
+            boolean status = false;
+            for (Ftmsorderbillsplans p : tmsorderbillsplansList) {
+                line++;
+                for (Ftmsorderbillscntrs cntr : tmsorderbillscntrsList) {
+                    if (p.getCntrId().equals(cntr.getCntrId())) {
+                        status = true;
+                        break;
+                    }
+                }
+                if (!status) {
+                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                    return AjaxResult.error("调拨第" + line + "行箱型箱量异常");
                 }
             }
-            if (!status) {
-                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                return AjaxResult.error("调拨第" + line + "行箱型箱量异常");
-            }
+            tmsorderbills.setPlanUserId(loginUser.getUser().getUserId());
+            tmsorderbills.setPlanUserName(loginUser.getUser().getNickName());
         }
         AjaxResult ajaxResult = updateItem(pId, 6, null, attachs, fees, plans, loginUser);
         String ajaxCode = ajaxResult.get("code").toString();
@@ -450,6 +452,12 @@ public class FtmsorderbillsServiceImpl implements IftmsorderbillsService {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return ajaxResult;
         }
+        tmsorderbills.setUpdateTime(new Date());
+        tmsorderbills.setUpdateBy(loginUser.getUsername());
+        if (ftmsorderbillsMapper.updateftmsorderbills(tmsorderbills) <= 0) {
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return AjaxResult.error("更新计划失败，若多次出现请联系管理员");
+        }
         return AjaxResult.success();
     }
 

ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/service/impl/FtmsorderbillsplansServiceImpl.java

@@ -486,6 +486,8 @@ public class FtmsorderbillsplansServiceImpl implements IftmsorderbillsplansServi
         ftmsorderbills.setBillStatus(20L);
         ftmsorderbills.setUpdateTime(new Date());
         ftmsorderbills.setUpdateBy(loginUser.getUsername());
+        ftmsorderbills.setPlanUserId(loginUser.getUser().getUserId());
+        ftmsorderbills.setPlanUserName(loginUser.getUser().getNickName());
         ftmsorderbillsMapper.updateftmsorderbills(ftmsorderbills);
         Ftmsorderbillsfees ftmsorderbillsfees = new Ftmsorderbillsfees();
         ftmsorderbillsfees.setfPid(pId);
@@ -598,7 +600,9 @@ public class FtmsorderbillsplansServiceImpl implements IftmsorderbillsplansServi
     public AjaxResult insertftmsorderbills(String tmsorder, String attachs, String fees, String plans, LoginUser loginUser) {
         Ftmsorderbills tmsorderbills = JSONArray.parseObject(tmsorder, Ftmsorderbills.class);
         Ftmsorderbills ftmsorderbills = ftmsorderbillsMapper.selectftmsorderbillsById(tmsorderbills.getId());
+        ftmsorderbills.setPlanUserId(loginUser.getUser().getUserId());
         ftmsorderbills.setTransUserId(loginUser.getUser().getUserId());
+        ftmsorderbills.setPlanUserName(loginUser.getUser().getNickName());
         ftmsorderbills.setTransUserName(loginUser.getUser().getNickName());
         ftmsorderbills.setBillStatus(60L);
         ftmsorderbills.setUpdateTime(new Date());

ruoyi-fleet/src/main/resources/mapper/orderPlan/ftmsorderbillscarsMapper.xml

@@ -580,10 +580,10 @@
             corp.f_name AS fCorpIds,
             u.nick_name AS planUserId,
             driver.nick_name AS driverUserIds,
-            t.un_load_date AS tUnLoadDate,
-            t.un_load_addr AS unLoadAddr,
-            t.un_load_attn AS unLoadAttn,
-            t.un_load_attn_tel AS unLoadAttnTel,
+            date_format( t.un_load_date, '%Y-%m-%d' ) AS tUnLoadDate,
+            t.un_load_addr AS tUnLoadAddr,
+            t.un_load_attn AS tUnLoadAttn,
+            t.un_load_attn_tel AS tUnLoadAttnTel,
             t.qty_plan AS qtyPlan,
             t.weight_plan AS weightPlan,
             t.bill_type AS billType,
@@ -591,12 +591,12 @@
             t.trans_prop AS transProp,
             t.md_load_addr AS tMdLoadAddr,
             t.md_load_attn AS tMdLoadAttn,
-            t.md_load_date AS tMdLoadDate,
+            t.md_load_attn_tel AS tMdLoadAttnTel,
+            date_format( t.md_load_date, '%Y-%m-%d' ) AS tMdLoadDate,
             t.load_addr AS tLoadAddr,
-            t.load_date AS tLoadDate,
-            t.load_attn AS loadAttn,
-            t.load_attntel AS loadAttntel,
-            c.carreg_no AS carregNo,
+            date_format( t.load_date, '%Y-%m-%d' ) AS tLoadDate,
+            t.load_attn AS tLoadAttn,
+            t.load_attntel AS tLoadAttntel,
             c.mblno,
             c.driverbonus,
             g.f_name AS goodsId,
@@ -610,8 +610,6 @@
             c.oil_amt AS oilAmt,
             c.cost_oth AS costOth,
             c.cntr_id AS cntrId,
-            c.driver_tel AS driverTel,
-            c.driver_name AS driverName,
             c.carreg_no AS carregNo,
             c.carcor_pid AS carcorPid,
             c.driver_tel AS driverTel,
@@ -619,23 +617,23 @@
             c.cost_remarks AS costRemarks,
             c.odometer_from AS odometerFrom,
             c.odometer_end AS odometerEnd,
-            c.accept_date AS acceptDate,
+            date_format( c.accept_date, '%Y-%m-%d' ) AS acceptDate,
             c.accept_remarks AS acceptRemarks,
-            IFNULL(c.costom_amt_01, 0) AS costomAmt01,
-            IFNULL(c.costom_amt_02, 0) AS costomAmt02,
-            IFNULL(c.costom_amt_03, 0) AS costomAmt03,
-            IFNULL(c.costom_amt_04, 0) AS costomAmt04,
-            IFNULL(c.costom_amt_05, 0) AS costomAmt05,
-            IFNULL(c.costom_amt_06, 0) AS costomAmt06,
+            IFNULL( c.costom_amt_01, 0 ) AS costomAmt01,
+            IFNULL( c.costom_amt_02, 0 ) AS costomAmt02,
+            IFNULL( c.costom_amt_03, 0 ) AS costomAmt03,
+            IFNULL( c.costom_amt_04, 0 ) AS costomAmt04,
+            IFNULL( c.costom_amt_05, 0 ) AS costomAmt05,
+            IFNULL( c.costom_amt_06, 0 ) AS costomAmt06,
             c.costom_str_01 AS costomStr01,
             c.costom_str_02 AS costomStr02,
-            c.load_date AS loadDate,
+            IFNULL( c.load_date, t.load_date ) AS loadDate,
             c.load_remarks AS loadRemarks,
-            c.md_load_date AS mdLoadDate,
+            date_format( c.md_load_date, '%Y-%m-%d' ) AS mdLoadDate,
             c.md_load_remarks AS mdLoadRemarks,
-            c.un_load_date AS unLoadDate,
+            date_format( c.un_load_date, '%Y-%m-%d' ) AS unLoadDate,
             c.un_load_remarks AS unLoadRemarks,
-            c.waybill_date AS waybillDate,
+            date_format( c.waybill_date, '%Y-%m-%d' ) AS waybillDate,
             c.waybill_remarks AS waybillRemarks
         FROM
             F_TMSORDERBILLSCARS c
@@ -652,7 +650,7 @@
     </select>
 
     <select id="selectMonthlyOrder" parameterType="ftmsorderbillscars" resultType="Map">
-        SELECT count( p_id ) countOrders, IFNULL(SUM( miles ),0) miles, IFNULL(SUM( freight_amt_dr ), 0) freightAmtDr
+        SELECT count( p_id ) countOrders, IFNULL(SUM( miles ),0) miles, IFNULL( SUM( driverbonus ), 0 ) freightAmtDr
         FROM F_TMSORDERBILLSCARS
         <where>
             driver_tel = #{driverTel}