1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/TranProcessInfoController.java

@@ -89,6 +89,13 @@ public class TranProcessInfoController {
     public String setUpTranPrice(@RequestBody TranProcessInfo tranProcessInfo){
         return tranProcessInfoService.setUpTranPrice(tranProcessInfo);
     }
+    /**
+     * 设置运输金额(按车)
+     */
+    @PostMapping("/api/setUpTranPriceCar")
+    public String setUpTranPriceCar(@RequestBody TranProcessInfo tranProcessInfo){
+        return tranProcessInfoService.setUpTranPriceCar(tranProcessInfo);
+    }
 
     /**
      * 他运反馈

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/ContractManagementInfo.java

@@ -415,8 +415,16 @@ public class ContractManagementInfo extends BaseModel<ContractManagementInfo> {
 
     @TableField(exist = false)
     private List<ContractManagementInfo> contractManagementInfoList;
+    /**
+     * 车牌号列表
+     */
     @TableField(exist = false)
     private List<TranCarInfo> tranCarInfoList;
+    /**
+     * 车队列表
+     */
+    @TableField(exist = false)
+    private List<TranCarInfo> tranCarInfoList1;
     @TableField(exist = false)
     private List<TranTaskInfo> tranTaskInfoList;
     /**

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/PaymentManagement.java

@@ -277,6 +277,34 @@ public class PaymentManagement extends BaseModel<PaymentManagement> {
      * 是否开票(0未开1已开)
      */
     private String invoicing;
+    /**
+     * 潮粮水分
+     */
+    private String tidalGrainWater;
+    /**
+     * 干粮水分
+     */
+    private String solidGrainWater;
+    /**
+     * 掉水
+     */
+    private String dropWaterContent;
+    /**
+     * 出库净重(公斤)
+     */
+    private Float outNetWeight;
+    /**
+     * 净重单价（元/公斤）
+     */
+    private Float netWeightPrice;
+    /**
+     * 纯重单价（元/公斤）
+     */
+    private Float pureWeightPrice;
+    /**
+     * 扣杂
+     */
+    private Float buckleMiscellaneous;
     /**
      * 模糊查询
      */

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/QualityInspectionManagement.java

@@ -233,6 +233,92 @@ public class QualityInspectionManagement extends BaseModel<QualityInspectionMana
      * 补录(0关1开)
      */
     private String supplementaryRecording;
+    /**
+     * 服务入库类型
+     */
+    private String serviceManagementType;
+    /**
+     * 原箱直销（1直销）
+     */
+    private String defaultBox;
+    /**
+     * 出入库任务编号
+     */
+    private String inOutTaskNo;
+    /**
+     * 运输方式(汽运，火运，集装箱船，散船)
+     */
+    private String outType;
+    /**
+     * 入库日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date inOutDate;
+    /**
+     * 运费
+     */
+    private Float freight;
+    /**
+     * 成本
+     */
+    private Float cost;
+    /**
+     * 扣款金额
+     */
+    private Double deductionAmount;
+    /**
+     * 复检扣款
+     */
+    private Double reDeductionAmount;
+    /**
+     * 车队
+     */
+    private String fleet;
+    /**
+     * 经办人key
+     */
+    private String agentKey;
+    /**
+     * 经办人
+     */
+    private String agent;
+    /**
+     * 出入库类型key
+     */
+    private String inOutTypeKey;
+    /**
+     * 出入库类型
+     */
+    private String inOutType;
+    /**
+     * 复检杂质
+     */
+    private String reImpurity;
+    /**
+     * 复检霉变粒
+     */
+    private String reMildewGrain;
+    /**
+     * 复检不完善粒
+     */
+    private String reImperfectGrain;
+    /**
+     * 复检容重
+     */
+    private String reBulkDensity;
+    /**
+     * 复检热损伤
+     */
+    private String reJiaorenli;
+    /**
+     * 复检等级key
+     */
+    private String reGradeKey;
+    /**
+     * 复检等级
+     */
+    private String reGrade;
 
     /**
      * 模糊查询
@@ -286,6 +372,11 @@ public class QualityInspectionManagement extends BaseModel<QualityInspectionMana
      */
     @TableField(exist = false)
     private String identityId;
+    /**
+     * 状态切换
+     */
+    @TableField(exist = false)
+    private String statusType;
     @Override
     protected Serializable pkVal() {
         return this.id;

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/TranCarInfo.java

@@ -61,6 +61,18 @@ public class TranCarInfo extends BaseModel<TranCarInfo> {
      * 司机姓名/联络员姓名
      */
     private String driver;
+    /**
+     * 计费方式(1按吨，2按车)
+     */
+    private String billingMethod;
+    /**
+     * 车队名称
+     */
+    private String fleetName;
+    /**
+     * 是否车队(0否1是)
+     */
+    private String fleetFlag;
     /**
      * 临时司机标识(1是)
      */

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/TranProcessInfo.java

@@ -55,6 +55,18 @@ public class TranProcessInfo extends BaseModel<TranProcessInfo> {
      * 审核中的运输价格
      */
     private Float tranPriceIng;
+    /**
+     * 计费方式(1按吨，2按车)
+     */
+    private String billingMethod;
+    /**
+     * 当前运输价格(按车)
+     */
+    private Float tranPriceCar;
+    /**
+     * 审核中的运输价格(按车)
+     */
+    private Float tranPriceIngCar;
     /**
      * 实际运费
      */
@@ -63,6 +75,10 @@ public class TranProcessInfo extends BaseModel<TranProcessInfo> {
      * 运输价格状态
      */
     private String priceStatus;
+    /**
+     * 运输价格状态(按车)
+     */
+    private String priceStatusCar;
     /**
      * 货名key
      */

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/WeighingManagement.java

@@ -136,6 +136,30 @@ public class WeighingManagement extends BaseModel<WeighingManagement> {
      * 皮检员
      */
     private String skinInspector;
+    /**
+     * 服务入库类型
+     */
+    private String serviceManagementType;
+    /**
+     * 扣重
+     */
+    private Float deductionWeight;
+    /**
+     * 运输方式(汽运，火运，集装箱船，散船)
+     */
+    private String outType;
+    /**
+     * 出入库任务编号
+     */
+    private String inOutTaskNo;
+    /**
+     * 收货单位
+     */
+    private String deliverUnit;
+    /**
+     * 移库任务编号
+     */
+    private String moveTaskNo;
     /**
      * 质检时间
      */
@@ -299,6 +323,11 @@ public class WeighingManagement extends BaseModel<WeighingManagement> {
      */
     @TableField(exist = false)
     private Integer allow;
+    /**
+     * 状态切换
+     */
+    @TableField(exist = false)
+    private String statusType;
     @Override
     protected Serializable pkVal() {
         return this.id;

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/ITranProcessInfoService.java

@@ -70,6 +70,12 @@ public interface ITranProcessInfoService extends IService<TranProcessInfo> {
      * @return
      */
     String setUpTranPrice(TranProcessInfo tranProcessInfo);
+    /**
+     * 设置运输价格按车
+     * @param tranProcessInfo
+     * @return
+     */
+    String setUpTranPriceCar(TranProcessInfo tranProcessInfo);
 
     /**
      * 他运反馈

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/QualityInspectionManagementServiceImpl.java

@@ -67,6 +67,8 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
         pageView.put("currentPage",qualityInspectionManagement.getCurrentPage());
         pageView.put("warehouseName",qualityInspectionManagement.getWarehouseName());
         pageView.put("managementType",qualityInspectionManagement.getManagementType());
+        pageView.put("serviceManagementType",qualityInspectionManagement.getServiceManagementType());
+        pageView.put("statusType",qualityInspectionManagement.getStatusType());
 
         // 查询销售订单总数
         Integer dataCount = baseMapper.getCountByCondition(pageView);
@@ -224,6 +226,7 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
         weighingManagement.setCustomerNumberCard(qualityInspectionManagement.getCustomerNumberCard());
         weighingManagement.setCarNumber(qualityInspectionManagement.getCarNumber());
         weighingManagement.setCompId(qualityInspectionManagement.getCompId());
+        weighingManagement.setServiceManagementType(qualityInspectionManagement.getServiceManagementType());
         weighingManagement.setGoodsName(qualityInspectionManagement.getGoodsName());
         weighingManagement.setBinNumber(qualityInspectionManagement.getBinNumber());
         weighingManagement.setType(qualityInspectionManagement.getType());

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/TranProcessInfoServiceImpl.java

@@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.google.common.collect.Lists;
 import com.winsea.svc.base.base.entity.CommonStaff;
+import com.winsea.svc.base.base.entity.CommonStaffRole;
 import com.winsea.svc.base.base.service.ICommonRoleResourceService;
+import com.winsea.svc.base.base.service.ICommonStaffRoleService;
 import com.winsea.svc.base.base.service.ICommonStaffService;
 import com.winsea.svc.base.security.util.AuthSecurityUtils;
 import com.winsea.svc.base.workflow.entity.Workflow;
@@ -31,6 +33,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -70,6 +73,8 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
     private IStockSaleReceiptReportService stockSaleReceiptReportService;
     @Autowired
     private IContractManagementInfoService contractManagementInfoService;
+    @Autowired
+    private ICommonStaffRoleService commonStaffRoleService;
     /**
      * 汽运调度分页列表查询
      *
@@ -198,6 +203,7 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String insertTranCar(TranProcessInfo tranProcessInfo) {
+        this.updateById(tranProcessInfo);
         List<TranCarInfo> tranCarInfoList = tranProcessInfo.getTranCarInfoList();
         if (!CollectionUtils.isEmpty(tranCarInfoList)) {
             for (TranCarInfo tranCarInfo : tranCarInfoList) {
@@ -812,6 +818,54 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
         return "ok";
     }
 
+    @Override
+    public String setUpTranPriceCar(TranProcessInfo tranProcessInfo) {
+        //物流部提交
+        if ("1".equals(tranProcessInfo.getFlag())) {
+            tranProcessInfo.setPriceStatusCar("审核中");
+            List<String> roleIdList = Lists.newArrayList();
+            if("1".equals(tranProcessInfo.getTranTypeKey())){
+                roleIdList = roleResourceService.getBindRoleIdsByResourceIds(AuthSecurityUtils.getCurrentUserInfo().getCompId(),
+                        Lists.newArrayList("transportationInfo-Execar"));
+                teskCar(tranProcessInfo,roleIdList);
+            }
+            else if("2".equals(tranProcessInfo.getTranTypeKey())){
+                roleIdList = roleResourceService.getBindRoleIdsByResourceIds(AuthSecurityUtils.getCurrentUserInfo().getCompId(),
+                        Lists.newArrayList("transportationInfo-Triancar"));
+                teskCar(tranProcessInfo,roleIdList);
+            }
+            else{
+                roleIdList = roleResourceService.getBindRoleIdsByResourceIds(AuthSecurityUtils.getCurrentUserInfo().getCompId(),
+                        Lists.newArrayList("transportationInfo-Shipcar"));
+                teskCar(tranProcessInfo,roleIdList);
+            }
+
+        }
+        //决策人审核
+        else if ("2".equals(tranProcessInfo.getFlag())) {
+            tranProcessInfo.setTranPriceCar(tranProcessInfo.getTranPriceIngCar());
+            tranProcessInfo.setTranPriceIngCar(0.0f);
+            tranProcessInfo.setPriceStatusCar("已通过");
+            //汽运生成审核记录
+            if(tranProcessInfo.getTranTypeKey()!=null&&"1".equals(tranProcessInfo.getTranTypeKey())) {
+                //生成审核记录
+                TranPriceApprove tranPriceApprove = new TranPriceApprove();
+                tranPriceApprove.setProcessId(tranProcessInfo.getId());
+                tranPriceApprove.setId(IdGenerator.generateUUID());
+                tranPriceApprove.setReviewer(tranProcessInfo.getReviewer());
+                tranPriceApprove.setResult("通过");
+                tranPriceApprove.setRecordType("1");
+                tranPriceApprove.setTranPrice(tranProcessInfo.getTranPriceCar());
+                tranPriceApproveService.insert(tranPriceApprove);
+            }
+            // 先删除任务
+            noticeService.removeNotice(BaseNotice.NoticeStatus.TASK, "TRAN-TEAM-APPROVE",
+                    tranProcessInfo.getId(), null);
+        }
+        this.updateById(tranProcessInfo);
+        return "ok";
+    }
+
 
     /**
      * 任务
@@ -845,6 +899,35 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
 
     }
 
+    private void teskCar(TranProcessInfo tranProcessInfo, List<String> roleIdList) {
+        // 先删除任务
+        noticeService.removeNotice(BaseNotice.NoticeStatus.TASK, "TRAN-TEAM-APPROVE",
+                tranProcessInfo.getId(), null);
+        String staffName = "XXX";
+        CommonStaff commitUserInfo = staffService.getInfo(AuthSecurityUtils.getCurrentUserId());
+        if (commitUserInfo != null) {
+            staffName = commitUserInfo.getMajorRole() != null
+                    ? commitUserInfo.getMajorRole().getRoleName() + " " + commitUserInfo.getStaffName()
+                    : commitUserInfo.getStaffName();
+        }
+        List<CommonStaffRole> commonStaffRoles = commonStaffRoleService.findStaff(roleIdList);
+        List<String> staffIds = commonStaffRoles.stream().map(CommonStaffRole::getStaffId).collect(Collectors.toList());
+        String taskContent = "";
+        // 向下一步操作人发送任务通知
+        taskContent =  staffName + "提交的运输单价等待审核";
+        NoticeTaskInfo taskInfo = new NoticeTaskInfo();
+        taskInfo.setCompId(commitUserInfo.getCompId());
+        taskInfo.setAcceptType(BaseNotice.AcceptStatus.STAFF);
+        taskInfo.setBusinessId(tranProcessInfo.getId());
+        taskInfo.setBusinessType("Tran");
+        taskInfo.setMessageContent(taskContent);
+        taskInfo.setBusinessCode("TRAN-TEAM-APPROVE");
+//            taskInfo.setNoticeTaskStatus(NoticeTaskInfo.NoticeTaskStatus.RETURN);
+        noticeTaskService.createNoticeTask(staffIds,
+                null, taskInfo);
+
+    }
+
     /**
      * 他运反馈
      * @param tranProcessInfo

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseBaseInfoServiceImpl.java

@@ -972,11 +972,20 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                         .eq("contract_id",contractManagementInfo.getId()));
                 //查合同下的车牌号,入库只能查到未提交的
                 List<TranCarInfo> tranCarInfoList=tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
-                        .eq("contract_no",contractManagementInfo.getContractNo()).eq("tran_type","4").eq("three_tran_type","汽运").ne("submit","2")
+                        .eq("contract_no",contractManagementInfo.getContractNo())
+                        .eq("fleet_flag","0").eq("tran_type","4").eq("three_tran_type","汽运").ne("submit","2")
                         .last("ORDER BY CONVERT ( car_no USING gbk ) ASC"));
                 if (!CollectionUtils.isEmpty(tranCarInfoList)){
                     contractManagementInfo.setTranCarInfoList(tranCarInfoList);
                 }
+                //查合同下的车队,入库只能查到未提交的
+                List<TranCarInfo> tranCarInfoList1=tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
+                        .eq("contract_no",contractManagementInfo.getContractNo())
+                        .eq("fleet_flag","1").eq("tran_type","4").eq("three_tran_type","汽运")
+                        .last("ORDER BY CONVERT ( car_no USING gbk ) ASC"));
+                if (!CollectionUtils.isEmpty(tranCarInfoList1)){
+                    contractManagementInfo.setTranCarInfoList1(tranCarInfoList1);
+                }
                 contractManagementInfo.setGoodsName(contractGoodsInfo.getGoodsName());
                 contractManagementInfo.setGoodsNameKey(contractGoodsInfo.getGoodsNameKey());
                 contractManagementInfo.setGrade(contractGoodsInfo.getGrade());
@@ -998,11 +1007,17 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                         .eq("contract_id",contractManagementInfo1.getId()));
                 //查合同下的车牌号,入库只能查到未提交的
                 List<TranCarInfo> tranCarInfoList=tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
-                        .eq("contract_no",contractManagementInfo1.getContractNo()).eq("tran_type","1").ne("submit","2")
+                        .eq("contract_no",contractManagementInfo1.getContractNo()).eq("fleet_flag","0").eq("tran_type","1").ne("submit","2")
                         .last("ORDER BY CONVERT ( car_no USING gbk ) ASC"));
                 if (!CollectionUtils.isEmpty(tranCarInfoList)){
                     contractManagementInfo1.setTranCarInfoList(tranCarInfoList);
                 }
+                List<TranCarInfo> tranCarInfoList1=tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
+                        .eq("contract_no",contractManagementInfo1.getContractNo()).eq("fleet_flag","0").eq("tran_type","1")
+                        .last("ORDER BY CONVERT ( car_no USING gbk ) ASC"));
+                if (!CollectionUtils.isEmpty(tranCarInfoList1)){
+                    contractManagementInfo1.setTranCarInfoList1(tranCarInfoList1);
+                }
                 contractManagementInfo1.setGoodsName(contractGoodsInfo.getGoodsName());
                 contractManagementInfo1.setGoodsNameKey(contractGoodsInfo.getGoodsNameKey());
                 contractManagementInfo1.setGrade(contractGoodsInfo.getGrade());
@@ -1020,11 +1035,17 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 BeanUtils.copyProperties(inOutWarehouseTask, contractManagementInfo);
                 //查移库任务编号下的车牌号,入库只能查到已出库的
                 List<TranCarInfo> tranCarInfoList=tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
-                        .eq("contract_no",inOutWarehouseTask.getMoveTaskNo()).eq("tran_type","1").eq("submit","1")
+                        .eq("contract_no",inOutWarehouseTask.getMoveTaskNo()).eq("fleet_flag","0").eq("tran_type","1").eq("submit","1")
                         .last("ORDER BY CONVERT ( car_no USING gbk ) ASC"));
                 if (!CollectionUtils.isEmpty(tranCarInfoList)){
                     contractManagementInfo.setTranCarInfoList(tranCarInfoList);
                 }
+                List<TranCarInfo> tranCarInfoList1=tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
+                        .eq("contract_no",inOutWarehouseTask.getMoveTaskNo()).eq("fleet_flag","0").eq("tran_type","1")
+                        .last("ORDER BY CONVERT ( car_no USING gbk ) ASC"));
+                if (!CollectionUtils.isEmpty(tranCarInfoList1)){
+                    contractManagementInfo.setTranCarInfoList1(tranCarInfoList1);
+                }
                 contractManagementInfo.setContractNo(inOutWarehouseTask.getMoveTaskNo());
                 contractManagementInfo.setContractPrice(inOutWarehouseTask.getUnitPrice());
                 //自运采购的移库

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WeighingManagementServiceImpl.java

@@ -69,8 +69,10 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
         }
         pageView.put("compId", weighingManagement.getCompId());
         pageView.put("searchKeyWord", weighingManagement.getSearchKeyWord());
+        pageView.put("serviceManagementType",weighingManagement.getServiceManagementType());
         pageView.put("startDate", weighingManagement.getStartDate());
         pageView.put("endDate", weighingManagement.getEndDate());
+        pageView.put("statusType",weighingManagement.getStatusType());
         if(StringUtils.isEmpty(weighingManagement.getViewFlag())){
             pageView.put("pageSize", weighingManagement.getPageSize());
             pageView.put("currentPage", weighingManagement.getCurrentPage());

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/QualityInspectionManagementMapper.xml

@@ -18,6 +18,20 @@
         <if test="managementType != null and managementType != ''">
             AND q.management_type = #{managementType}
         </if>
+        <if test="serviceManagementType != null and serviceManagementType != ''">
+            AND q.service_management_type = #{serviceManagementType}
+        </if>
+        <if test="statusType != null and statusType != ''">
+            <if test="statusType == 1">
+                AND (q.status_flag='0' and q.confirm='0')
+            </if>
+            <if test="statusType == 2">
+                AND (q.status_flag='2' and q.confirm='0')
+            </if>
+            <if test="statusType == 3">
+                AND (q.status_flag='2' and q.confirm='1')
+            </if>
+        </if>
     </select>
     <!-- 获得质检管理列表 -->
     <select id="getListByCondition" parameterType="Map"
@@ -71,6 +85,20 @@
         <if test="managementType != null and managementType != ''">
             AND q.management_type = #{managementType}
         </if>
+        <if test="serviceManagementType != null and serviceManagementType != ''">
+            AND q.service_management_type = #{serviceManagementType}
+        </if>
+        <if test="statusType != null and statusType != ''">
+            <if test="statusType == 1">
+                AND (q.status_flag='0' and q.confirm='0')
+            </if>
+            <if test="statusType == 2">
+                AND (q.status_flag='2' and q.confirm='0')
+            </if>
+            <if test="statusType == 3">
+                AND (q.status_flag='2' and q.confirm='1')
+            </if>
+        </if>
         ORDER BY q.status_flag Asc,q.confirm Asc,q.update_date DESC
         <if test="currentPage != null and currentPage != ''">
             LIMIT ${startRecord}, ${pageSize}

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/WeighingManagementMapper.xml

@@ -27,6 +27,17 @@
         <if test="managementType != null and managementType != ''">
             AND management_type = #{managementType}
         </if>
+        <if test="serviceManagementType != null and serviceManagementType != ''">
+            AND service_management_type = #{serviceManagementType}
+        </if>
+        <if test="statusType != null and statusType != ''">
+            <if test="statusType == 1">
+                AND status_flag='1'
+            </if>
+            <if test="statusType == 2">
+                AND status_flag='3'
+            </if>
+        </if>
     </select>
     <!-- 获得检斤管理列表 -->
     <select id="getListByCondition" parameterType="Map"
@@ -87,6 +98,17 @@
         <if test="managementType != null and managementType != ''">
             AND a.management_type = #{managementType}
         </if>
+        <if test="serviceManagementType != null and serviceManagementType != ''">
+            AND service_management_type = #{serviceManagementType}
+        </if>
+        <if test="statusType != null and statusType != ''">
+            <if test="statusType == 1">
+                AND status_flag='1'
+            </if>
+            <if test="statusType == 2">
+                AND status_flag='3'
+            </if>
+        </if>
         ORDER BY a.update_date DESC
         <if test="currentPage != null and currentPage != ''">
             LIMIT ${startRecord}, ${pageSize}