解决禅道问题

ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/domain/Ftmsorderbills.java

@@ -250,22 +250,551 @@ public class Ftmsorderbills extends BaseEntity {
      * 查询下单时间区间
      */
     private List<String> planDate;
-    public void setPlanDate(List<String> planDate) {
-        this.planDate = planDate;
-    }
-    public List<String> getPlanDate() {
-        return planDate;
-    }
 
     /**
      * 查询司机提箱时间区间
      */
     private List<String> cLoadDate;
-    public void setCLoadDate(List<String> cLoadDate) {
-        this.cLoadDate = cLoadDate;
+
+    public String getIsFleet() {
+        return isFleet;
+    }
+
+    public void setIsFleet(String isFleet) {
+        this.isFleet = isFleet;
+    }
+
+    /** 是否是区分车队 */
+    private String isFleet;
+
+    /** 车队id */
+    private Long fleetId;
+
+    public Long getFleetId() {
+        return fleetId;
+    }
+
+    public void setFleetId(Long fleetId) {
+        this.fleetId = fleetId;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getBillNo() {
+        return billNo;
+    }
+
+    public void setBillNo(String billNo) {
+        this.billNo = billNo;
+    }
+
+    public Long getActId() {
+        return actId;
+    }
+
+    public void setActId(Long actId) {
+        this.actId = actId;
+    }
+
+    public Long getCorpId() {
+        return corpId;
+    }
+
+    public void setCorpId(Long corpId) {
+        this.corpId = corpId;
     }
-    public List<String> getCLoadDate() {
+
+    public Long getPlanUserId() {
+        return planUserId;
+    }
+
+    public void setPlanUserId(Long planUserId) {
+        this.planUserId = planUserId;
+    }
+
+    public String getTransUserName() {
+        return transUserName;
+    }
+
+    public void setTransUserName(String transUserName) {
+        this.transUserName = transUserName;
+    }
+
+    public String getPlanUserName() {
+        return planUserName;
+    }
+
+    public void setPlanUserName(String planUserName) {
+        this.planUserName = planUserName;
+    }
+
+    public Long getBillType() {
+        return billType;
+    }
+
+    public void setBillType(Long billType) {
+        this.billType = billType;
+    }
+
+    public Long getTransUserId() {
+        return transUserId;
+    }
+
+    public void setTransUserId(Long transUserId) {
+        this.transUserId = transUserId;
+    }
+
+    public String getTransType() {
+        return transType;
+    }
+
+    public void setTransType(String transType) {
+        this.transType = transType;
+    }
+
+    public String getTransProp() {
+        return transProp;
+    }
+
+    public void setTransProp(String transProp) {
+        this.transProp = transProp;
+    }
+
+    public String getIfContracted() {
+        return ifContracted;
+    }
+
+    public void setIfContracted(String ifContracted) {
+        this.ifContracted = ifContracted;
+    }
+
+    public String getContractNo() {
+        return contractNo;
+    }
+
+    public void setContractNo(String contractNo) {
+        this.contractNo = contractNo;
+    }
+
+    public String getRefNo() {
+        return refNo;
+    }
+
+    public void setRefNo(String refNo) {
+        this.refNo = refNo;
+    }
+
+    public Long getAccstlType() {
+        return accstlType;
+    }
+
+    public void setAccstlType(Long accstlType) {
+        this.accstlType = accstlType;
+    }
+
+    public Long getAccdays() {
+        return accdays;
+    }
+
+    public void setAccdays(Long accdays) {
+        this.accdays = accdays;
+    }
+
+    public Long getGoodsId() {
+        return goodsId;
+    }
+
+    public void setGoodsId(Long goodsId) {
+        this.goodsId = goodsId;
+    }
+
+    public BigDecimal getGoodsPrice() {
+        return goodsPrice;
+    }
+
+    public void setGoodsPrice(BigDecimal goodsPrice) {
+        this.goodsPrice = goodsPrice;
+    }
+
+    public String getGoodsLossType() {
+        return goodsLossType;
+    }
+
+    public void setGoodsLossType(String goodsLossType) {
+        this.goodsLossType = goodsLossType;
+    }
+
+    public BigDecimal getGoodsLossStd() {
+        return goodsLossStd;
+    }
+
+    public void setGoodsLossStd(BigDecimal goodsLossStd) {
+        this.goodsLossStd = goodsLossStd;
+    }
+
+    public String getMblno() {
+        return mblno;
+    }
+
+    public void setMblno(String mblno) {
+        this.mblno = mblno;
+    }
+
+    public String getYsl() {
+        return ysl;
+    }
+
+    public void setYsl(String ysl) {
+        this.ysl = ysl;
+    }
+
+    public String getVoy() {
+        return voy;
+    }
+
+    public void setVoy(String voy) {
+        this.voy = voy;
+    }
+
+    public Long getPolId() {
+        return polId;
+    }
+
+    public void setPolId(Long polId) {
+        this.polId = polId;
+    }
+
+    public BigDecimal getQtyPlan() {
+        return qtyPlan;
+    }
+
+    public void setQtyPlan(BigDecimal qtyPlan) {
+        this.qtyPlan = qtyPlan;
+    }
+
+    public Long getPodId() {
+        return podId;
+    }
+
+    public void setPodId(Long podId) {
+        this.podId = podId;
+    }
+
+    public Long getQtyDisPatch() {
+        return qtyDisPatch;
+    }
+
+    public void setQtyDisPatch(Long qtyDisPatch) {
+        this.qtyDisPatch = qtyDisPatch;
+    }
+
+    public BigDecimal getWeightPlan() {
+        return weightPlan;
+    }
+
+    public void setWeightPlan(BigDecimal weightPlan) {
+        this.weightPlan = weightPlan;
+    }
+
+    public String getCntrDesc() {
+        return cntrDesc;
+    }
+
+    public void setCntrDesc(String cntrDesc) {
+        this.cntrDesc = cntrDesc;
+    }
+
+    public String getCarNoList() {
+        return carNoList;
+    }
+
+    public void setCarNoList(String carNoList) {
+        this.carNoList = carNoList;
+    }
+
+    public String getLoadAddr() {
+        return loadAddr;
+    }
+
+    public void setLoadAddr(String loadAddr) {
+        this.loadAddr = loadAddr;
+    }
+
+    public String getLoadAttn() {
+        return loadAttn;
+    }
+
+    public void setLoadAttn(String loadAttn) {
+        this.loadAttn = loadAttn;
+    }
+
+    public String getLoadAttntel() {
+        return loadAttntel;
+    }
+
+    public void setLoadAttntel(String loadAttntel) {
+        this.loadAttntel = loadAttntel;
+    }
+
+    public Date getLoadDate() {
+        return loadDate;
+    }
+
+    public void setLoadDate(Date loadDate) {
+        this.loadDate = loadDate;
+    }
+
+    public String getMdLoadAddr() {
+        return mdLoadAddr;
+    }
+
+    public void setMdLoadAddr(String mdLoadAddr) {
+        this.mdLoadAddr = mdLoadAddr;
+    }
+
+    public String getMdLoadAttn() {
+        return mdLoadAttn;
+    }
+
+    public void setMdLoadAttn(String mdLoadAttn) {
+        this.mdLoadAttn = mdLoadAttn;
+    }
+
+    public String getMdLoadAttnTel() {
+        return mdLoadAttnTel;
+    }
+
+    public void setMdLoadAttnTel(String mdLoadAttnTel) {
+        this.mdLoadAttnTel = mdLoadAttnTel;
+    }
+
+    public Date getMdLoadDate() {
+        return mdLoadDate;
+    }
+
+    public void setMdLoadDate(Date mdLoadDate) {
+        this.mdLoadDate = mdLoadDate;
+    }
+
+    public String getUnLoadAddr() {
+        return unLoadAddr;
+    }
+
+    public void setUnLoadAddr(String unLoadAddr) {
+        this.unLoadAddr = unLoadAddr;
+    }
+
+    public String getUnLoadAttn() {
+        return unLoadAttn;
+    }
+
+    public void setUnLoadAttn(String unLoadAttn) {
+        this.unLoadAttn = unLoadAttn;
+    }
+
+    public String getUnLoadAttnTel() {
+        return unLoadAttnTel;
+    }
+
+    public void setUnLoadAttnTel(String unLoadAttnTel) {
+        this.unLoadAttnTel = unLoadAttnTel;
+    }
+
+    public Date getUnLoadDate() {
+        return unLoadDate;
+    }
+
+    public void setUnLoadDate(Date unLoadDate) {
+        this.unLoadDate = unLoadDate;
+    }
+
+    public Long getRouteId() {
+        return routeId;
+    }
+
+    public void setRouteId(Long routeId) {
+        this.routeId = routeId;
+    }
+
+    public String getRouteDesc() {
+        return routeDesc;
+    }
+
+    public void setRouteDesc(String routeDesc) {
+        this.routeDesc = routeDesc;
+    }
+
+    public String getIfWaybill() {
+        return ifWaybill;
+    }
+
+    public void setIfWaybill(String ifWaybill) {
+        this.ifWaybill = ifWaybill;
+    }
+
+    public String getIfNeedinvDr() {
+        return ifNeedinvDr;
+    }
+
+    public void setIfNeedinvDr(String ifNeedinvDr) {
+        this.ifNeedinvDr = ifNeedinvDr;
+    }
+
+    public Date getPostDate() {
+        return postDate;
+    }
+
+    public void setPostDate(Date postDate) {
+        this.postDate = postDate;
+    }
+
+    public Long getBillStatus() {
+        return billStatus;
+    }
+
+    public void setBillStatus(Long billStatus) {
+        this.billStatus = billStatus;
+    }
+
+    public String getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(String delFlag) {
+        this.delFlag = delFlag;
+    }
+
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
+    public Long getOrderStatus() {
+        return orderStatus;
+    }
+
+    public void setOrderStatus(Long orderStatus) {
+        this.orderStatus = orderStatus;
+    }
+
+    public String getCarStatus() {
+        return carStatus;
+    }
+
+    public void setCarStatus(String carStatus) {
+        this.carStatus = carStatus;
+    }
+
+    public String getCarregNo() {
+        return carregNo;
+    }
+
+    public void setCarregNo(String carregNo) {
+        this.carregNo = carregNo;
+    }
+
+    public String getDriverTel() {
+        return driverTel;
+    }
+
+    public void setDriverTel(String driverTel) {
+        this.driverTel = driverTel;
+    }
+
+    public String getInvoiceType() {
+        return invoiceType;
+    }
+
+    public void setInvoiceType(String invoiceType) {
+        this.invoiceType = invoiceType;
+    }
+
+    public List<String> getPlanDate() {
+        return planDate;
+    }
+
+    public void setPlanDate(List<String> planDate) {
+        this.planDate = planDate;
+    }
+
+    public List<String> getcLoadDate() {
         return cLoadDate;
     }
 
+    public void setcLoadDate(List<String> cLoadDate) {
+        this.cLoadDate = cLoadDate;
+    }
+
+    @Override
+    public String toString() {
+        return "Ftmsorderbills{" +
+                "id=" + id +
+                ", billNo='" + billNo + '\'' +
+                ", actId=" + actId +
+                ", corpId=" + corpId +
+                ", planUserId=" + planUserId +
+                ", transUserName='" + transUserName + '\'' +
+                ", planUserName='" + planUserName + '\'' +
+                ", billType=" + billType +
+                ", transUserId=" + transUserId +
+                ", transType='" + transType + '\'' +
+                ", transProp='" + transProp + '\'' +
+                ", ifContracted='" + ifContracted + '\'' +
+                ", contractNo='" + contractNo + '\'' +
+                ", refNo='" + refNo + '\'' +
+                ", accstlType=" + accstlType +
+                ", accdays=" + accdays +
+                ", goodsId=" + goodsId +
+                ", goodsPrice=" + goodsPrice +
+                ", goodsLossType='" + goodsLossType + '\'' +
+                ", goodsLossStd=" + goodsLossStd +
+                ", mblno='" + mblno + '\'' +
+                ", ysl='" + ysl + '\'' +
+                ", voy='" + voy + '\'' +
+                ", polId=" + polId +
+                ", qtyPlan=" + qtyPlan +
+                ", podId=" + podId +
+                ", qtyDisPatch=" + qtyDisPatch +
+                ", weightPlan=" + weightPlan +
+                ", cntrDesc='" + cntrDesc + '\'' +
+                ", carNoList='" + carNoList + '\'' +
+                ", loadAddr='" + loadAddr + '\'' +
+                ", loadAttn='" + loadAttn + '\'' +
+                ", loadAttntel='" + loadAttntel + '\'' +
+                ", loadDate=" + loadDate +
+                ", mdLoadAddr='" + mdLoadAddr + '\'' +
+                ", mdLoadAttn='" + mdLoadAttn + '\'' +
+                ", mdLoadAttnTel='" + mdLoadAttnTel + '\'' +
+                ", mdLoadDate=" + mdLoadDate +
+                ", unLoadAddr='" + unLoadAddr + '\'' +
+                ", unLoadAttn='" + unLoadAttn + '\'' +
+                ", unLoadAttnTel='" + unLoadAttnTel + '\'' +
+                ", unLoadDate=" + unLoadDate +
+                ", routeId=" + routeId +
+                ", routeDesc='" + routeDesc + '\'' +
+                ", ifWaybill='" + ifWaybill + '\'' +
+                ", ifNeedinvDr='" + ifNeedinvDr + '\'' +
+                ", postDate=" + postDate +
+                ", billStatus=" + billStatus +
+                ", delFlag='" + delFlag + '\'' +
+                ", remarks='" + remarks + '\'' +
+                ", orderStatus=" + orderStatus +
+                ", carStatus='" + carStatus + '\'' +
+                ", carregNo='" + carregNo + '\'' +
+                ", driverTel='" + driverTel + '\'' +
+                ", invoiceType='" + invoiceType + '\'' +
+                ", planDate=" + planDate +
+                ", cLoadDate=" + cLoadDate +
+                ", isFleet=" + isFleet +
+                '}';
+    }
 }

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

@@ -20,7 +20,9 @@ import com.ruoyi.finance.mapper.TFeeDoMapper;
 import com.ruoyi.framework.web.service.WechatService;
 import com.ruoyi.orderPlan.domain.*;
 import com.ruoyi.orderPlan.mapper.*;
+import com.ruoyi.system.mapper.SysRoleMapper;
 import com.ruoyi.system.mapper.SysUserMapper;
+import com.ruoyi.system.mapper.SysUserRoleMapper;
 import com.ruoyi.warehouseBusiness.domain.BillnoDel;
 import com.ruoyi.warehouseBusiness.mapper.BillnoDelMapper;
 import com.ruoyi.warehouseBusiness.service.impl.BillnoSerialServiceImpl;
@@ -44,6 +46,7 @@ import javax.validation.constraints.Size;
 @Slf4j
 @Service
 public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService {
+
     @Autowired
     private TFeeDoMapper tFeeDoMapper;
 
@@ -51,6 +54,9 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
     private TCorpsMapper tCorpsMapper;
 
     @Autowired
+    private SysRoleMapper sysRoleMapper;
+
+    @Autowired
     private WechatService wechatService;
 
     @Autowired
@@ -60,6 +66,9 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
     private BillnoDelMapper billnoDelMapper;
 
     @Autowired
+    private SysUserRoleMapper sysUserRoleMapper;
+
+    @Autowired
     private FtmsorderbillsMapper ftmsorderbillsMapper;
 
     @Autowired
@@ -146,6 +155,14 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
                 return null;
             }
         }
+        String roleType = "车队";
+        // 判断是不是车队
+        SysUser sysUser = sysUserRoleMapper.selectRoleUserByUserId(user.getUserId(), roleType);
+        if (StringUtils.isNotNull(sysUser)) {
+            ftmsorderbills.setIsFleet("1");
+            TCorps corps = tCorpsMapper.selectTCorpsByFTel(sysUser.getPhonenumber());
+            ftmsorderbills.setFleetId(corps.getfId());
+        }
         return ftmsorderbillscarsMapper.selectftmsorderbillscarsMapList(ftmsorderbills);
     }
 

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

@@ -506,6 +506,7 @@
             F_TMSORDERBILLSCARS c
             LEFT JOIN F_TMSORDERBILLS t ON t.id = c.org_id
             LEFT JOIN t_corps p ON p.f_id = t.corp_id
+            LEFT JOIN t_corps fleet ON fleet.f_id = c.carcor_pid
             LEFT JOIN t_goods g ON g.f_id = t.goods_id
             LEFT JOIN t_address pol ON pol.f_id = t.pol_id
             AND pol.f_types = 1
@@ -528,6 +529,10 @@
             <if test="carStatus != null and carStatus == 'mdLoadDate'">and c.md_load_date IS NULL</if>
             <if test="carStatus != null and carStatus == 'unLoadDate'">and c.un_load_date IS NULL</if>
             <if test="carStatus != null and carStatus == 'waybillDate'">and c.waybill_date IS NULL</if>
+            <if test="isFleet != null and isFleet == '1'">
+                AND fleet.f_typeid = '["4"]'
+                AND fleet.f_id = #{fleetId}
+            </if>
             <if test='planDate != null and planDate[0] != null and planDate[0]!= ""'>
                 and c.plan_date &gt;= #{planDate[0]}
             </if>

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java

@@ -70,4 +70,11 @@ public interface SysUserRoleMapper
      * @return 结果
      */
     public int deleteUserRoleInfos(@Param("roleId") Long roleId, @Param("userIds") Long[] userIds);
+
+    /**
+     *  根据用户id查询是否存是车队用户
+     * @param userId    用户id
+     * @return  结果
+     */
+    public SysUser selectRoleUserByUserId(@Param("userId") Long userId, @Param("roleType") String roleType);
 }

ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml

@@ -12,11 +12,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<resultMap type="SysUser" id="SysUserResult">
 		<id     property="userId"       column="user_id"      />
 		<result property="deptId"       column="dept_id"      />
+		<result property="phonenumber"  column="phonenumber"  />
 		<result property="userName"     column="user_name"    />
 		<result property="nickName"     column="nick_name"    />
 	</resultMap>
 
-
 	<delete id="deleteUserRoleByUserId" parameterType="Long">
 		delete from sys_user_role where user_id=#{userId}
 	</delete>
@@ -64,4 +64,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			AND usr.status = '0'
 			AND usr.del_flag = '0'
 	</select>
-</mapper> 
+
+	<select id="selectRoleUserByUserId" resultMap="SysUserResult">
+		SELECT
+			usr.user_id,
+			usr.dept_id,
+			usr.phonenumber,
+			usr.user_name,
+			usr.nick_name
+		FROM
+			sys_user usr
+			LEFT JOIN sys_user_role role ON role.user_id = usr.user_id
+			LEFT JOIN sys_role r ON role.role_id = r.role_id
+		WHERE
+			usr.user_id = #{userId}
+			AND r.status = '0'
+			AND r.role_name = #{roleType}
+			AND usr.status = '0'
+			AND usr.del_flag = '0'
+	</select>
+
+</mapper>

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/mapper/TCorpsMapper.java

@@ -97,4 +97,11 @@ public interface TCorpsMapper extends BaseMapper<TCorps> {
      * @return
      */
     public List<Map<String, Object>> selectFleetDriverMsgListMap(TCorps tCorps);
+
+    /**
+     *  根据手机号查询司机信息
+     * @param phonenumber   手机号
+     * @return  结果
+     */
+    public TCorps selectTCorpsByFTel(String phonenumber);
 }

ruoyi-warehouse/src/main/resources/mapper/basicData/TCorpsMapper.xml

@@ -173,6 +173,10 @@
         </where>
     </select>
 
+    <select id="selectTCorpsByFTel" resultType="string" parameterType="TCorps">
+        select f_id, f_pid, f_typeid, f_no, f_name from t_corps where f_tel = #{phonenumber}
+    </select>
+
     <insert id="insertTCorps" parameterType="TCorps" useGeneratedKeys="true" keyProperty="fId">
         insert into t_corps
         <trim prefix="(" suffix=")" suffixOverrides=",">