Merge remote-tracking branch 'origin/dev' into dev

ruoyi-admin/src/main/java/com/ruoyi/web/controller/fleet/orderPlan/ftmsorderbillscarsController.java

@@ -7,8 +7,10 @@ import java.util.Map;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.ServletUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.spring.SpringUtils;
@@ -76,6 +78,14 @@ public class ftmsorderbillscarsController extends BaseController {
         startPage();
         List<FtmsorderbillscarsExcel> list = ftmsorderbillscarsService.selectftmsorderbillscarsMapListModify(tmsorder);
         map.put("dataTable", getDataTable(list));
+        //增加是否具有审核资格字段返回
+        map.put("isApprove",false);
+        List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
+        for (int i = 0; i < roles.size(); i++) {
+            if("FeeRevisionAuditor".equals(roles.get(i).getRoleKey())){
+                map.put("isApprove",true);
+            }
+        }
         return map;
     }
 
@@ -231,7 +241,7 @@ public class ftmsorderbillscarsController extends BaseController {
     /**
      * 司机操作接单/提箱/装卸货/还卸柜/回单操作  保存
      */
-    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscars:edit')")
+//    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscars:edit')")
     @Log(title = "车队派车", businessType = BusinessType.INSERT)
     @PostMapping(value = "/driverSave")
     @RepeatSubmit
@@ -251,7 +261,7 @@ public class ftmsorderbillscarsController extends BaseController {
     /**
      * 司机操作接单/提箱/装卸货/还卸柜/回单操作  提交
      */
-    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscars:edit')")
+//    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscars:edit')")
     @Log(title = "车队派车", businessType = BusinessType.INSERT)
     @PostMapping(value = "/insertDriver")
     @RepeatSubmit
@@ -270,7 +280,7 @@ public class ftmsorderbillscarsController extends BaseController {
     /**
      * 状态跟踪提交  提交
      */
-    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscars:edit')")
+//    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscars:edit')")
     @Log(title = "车队派车", businessType = BusinessType.INSERT)
     @PostMapping(value = "/driverSubmit")
     @RepeatSubmit
@@ -312,7 +322,7 @@ public class ftmsorderbillscarsController extends BaseController {
     /**
      * 司机操作接单/提箱/装卸货/还卸柜/回单操作  变更
      */
-    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscars:edit')")
+//    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscars:edit')")
     @Log(title = "车队派车", businessType = BusinessType.INSERT)
     @PostMapping(value = "/operationalChanges")
     @RepeatSubmit
@@ -331,7 +341,7 @@ public class ftmsorderbillscarsController extends BaseController {
     /**
      * 单条车辆安排 变更
      */
-    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscars:edit')")
+//    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscars:edit')")
     @Log(title = "车队派车", businessType = BusinessType.INSERT)
     @PostMapping(value = "/vehicleOperationChanges/{id}")
     @RepeatSubmit
@@ -345,7 +355,7 @@ public class ftmsorderbillscarsController extends BaseController {
     /**
      * 单条车辆安排变更提交接口
      */
-    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscars:add')")
+//    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscars:add')")
     @Log(title = "车队派车", businessType = BusinessType.INSERT)
     @PostMapping(value = "/vehicleArrangementChange")
     @RepeatSubmit
@@ -361,7 +371,7 @@ public class ftmsorderbillscarsController extends BaseController {
     /**
      * 单条车辆安排提交接口
      */
-    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscars:add')")
+//    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscars:add')")
     @Log(title = "车队派车", businessType = BusinessType.INSERT)
     @PostMapping(value = "/vehicleArrangementAddStowage")
     @RepeatSubmit
@@ -377,7 +387,7 @@ public class ftmsorderbillscarsController extends BaseController {
     /**
      * 单条车辆安排提交接口
      */
-    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscars:add')")
+//    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscars:add')")
     @Log(title = "车队派车", businessType = BusinessType.INSERT)
     @PostMapping(value = "/vehicleArrangementAdd")
     @RepeatSubmit
@@ -393,7 +403,7 @@ public class ftmsorderbillscarsController extends BaseController {
     /**
      * 单条车辆安排撤销接口
      */
-    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscars:edit')")
+//    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscars:edit')")
     @PostMapping(value = "/vehicleArrangementRevokeStowage")
     @RepeatSubmit
     public AjaxResult vehicleArrangementRevokeStowage(@RequestBody Ftmsorderbillscars ftmsorderbillscars) {
@@ -408,7 +418,7 @@ public class ftmsorderbillscarsController extends BaseController {
     /**
      * 单条车辆安排撤销接口
      */
-    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscars:edit')")
+//    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscars:edit')")
     @PostMapping(value = "/vehicleArrangementRevoke")
     @RepeatSubmit
     public AjaxResult vehicleArrangementRevoke(@RequestBody Ftmsorderbillscars ftmsorderbillscars) {
@@ -423,7 +433,7 @@ public class ftmsorderbillscarsController extends BaseController {
     /**
      * 单条车辆安排删除接口
      */
-    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscars:remove')")
+//    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscars:remove')")
     @PostMapping(value = "/vehicleArrangementRemove")
     @RepeatSubmit
     public AjaxResult vehicleArrangementRemove(@RequestBody Ftmsorderbillscars ftmsorderbillscars) {
@@ -438,7 +448,7 @@ public class ftmsorderbillscarsController extends BaseController {
     /**
      * 暂存车队派车
      */
-    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscars:add')")
+//    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscars:add')")
     @Log(title = "车队派车", businessType = BusinessType.INSERT)
     @PostMapping(value = "/save")
     @RepeatSubmit
@@ -457,7 +467,7 @@ public class ftmsorderbillscarsController extends BaseController {
     /**
      * 车队派车提交
      */
-    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscars:add')")
+//    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscars:add')")
     @Log(title = "车队派车", businessType = BusinessType.INSERT)
     @PostMapping(value = "/add")
     @RepeatSubmit
@@ -479,7 +489,7 @@ public class ftmsorderbillscarsController extends BaseController {
     /**
      * 车队派车（大）变更
      */
-    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscars:add')")
+//    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscars:add')")
     @Log(title = "车队派车", businessType = BusinessType.INSERT)
     @PostMapping(value = "/change/{id}")
     @RepeatSubmit
@@ -494,7 +504,7 @@ public class ftmsorderbillscarsController extends BaseController {
     /**
      * 修改车队派车
      */
-    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscars:edit')")
+//    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscars:edit')")
     @Log(title = "车队派车", businessType = BusinessType.UPDATE)
     @PutMapping
     @RepeatSubmit
@@ -505,7 +515,7 @@ public class ftmsorderbillscarsController extends BaseController {
     /**
      * 删除车队派车
      */
-    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscars:remove')")
+//    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscars:remove')")
     @Log(title = "车队派车", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     @RepeatSubmit

ruoyi-admin/src/main/java/com/ruoyi/web/controller/fleet/orderPlan/ftmsorderbillsfeesController.java

@@ -31,7 +31,7 @@ public class ftmsorderbillsfeesController extends BaseController {
     /**
      * 查询费用是否允许变更
      */
-    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscars:edit')")
+//    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscars:edit')")
     @Log(title = "费用补充", businessType = BusinessType.INSERT)
     @GetMapping("/ftmsorderbillsChange/{fId}")
     @RepeatSubmit
@@ -46,7 +46,7 @@ public class ftmsorderbillsfeesController extends BaseController {
     /**
      * 删除单条费用
      */
-    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscars:edit')")
+//    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscars:edit')")
     @Log(title = "费用补充", businessType = BusinessType.INSERT)
     @GetMapping("/singleFleetDelete/{fId}")
     @RepeatSubmit
@@ -61,7 +61,7 @@ public class ftmsorderbillsfeesController extends BaseController {
     /**
      * 撤销单条费用
      */
-    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscars:edit')")
+//    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscars:edit')")
     @Log(title = "费用补充", businessType = BusinessType.INSERT)
     @GetMapping("/revokeFleetDelete/{fId}")
     @RepeatSubmit
@@ -94,7 +94,7 @@ public class ftmsorderbillsfeesController extends BaseController {
     /**
      * 单条费用提交(暂存)
      */
-    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscars:add')")
+//    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscars:add')")
     @Log(title = "费用补充", businessType = BusinessType.INSERT)
     @PostMapping("/addModify")
     @RepeatSubmit
@@ -112,7 +112,7 @@ public class ftmsorderbillsfeesController extends BaseController {
     /**
      * 多条条费用提交(暂存)
      */
-    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscars:add')")
+//    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscars:add')")
     @Log(title = "费用补充", businessType = BusinessType.INSERT)
     @PostMapping("/addModifyList")
     @RepeatSubmit
@@ -132,7 +132,7 @@ public class ftmsorderbillsfeesController extends BaseController {
      * 2021-07-19 dongyongwei
      */
     @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscars:add')")
-    @Log(title = "提交审批", businessType = BusinessType.INSERT)
+//    @Log(title = "提交审批", businessType = BusinessType.INSERT)
     @GetMapping("/submitOrderbillsfeesModifyApproval")
     @RepeatSubmit
     public AjaxResult submitOrderbillsfeesModifyApproval(@RequestParam("fId") Long fId) {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/check/TWarehouseCheckController.java

@@ -7,6 +7,8 @@ import com.ruoyi.basicData.service.ITWarehouseService;
 import com.ruoyi.common.core.domain.entity.TWarehouse;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.warehouse.check.domain.TWarehouseCheckItems;
+import com.ruoyi.warehouse.check.domain.TWarehouseCheckItemsDetails;
+import com.ruoyi.warehouse.check.service.ITWarehouseCheckItemsDetailsService;
 import com.ruoyi.warehouse.check.service.ITWarehouseCheckItemsService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,6 +45,9 @@ public class TWarehouseCheckController extends BaseController
     @Autowired
     private ITWarehouseCheckItemsService itWarehouseCheckItemsService;
 
+    @Autowired
+    private ITWarehouseCheckItemsDetailsService tWarehouseCheckItemsDetailsService;
+
     /**
      * 获取表内存在的仓库列表
      */
@@ -178,6 +183,15 @@ public class TWarehouseCheckController extends BaseController
 	@DeleteMapping("/{fIds}")
     public AjaxResult remove(@PathVariable Long[] fIds)
     {
+        for (int f = 0; f < fIds.length; f++) {
+            Long checkId = fIds[f];
+            TWarehouseCheckItemsDetails tWarehouseCheckItemsDetailsQuery = new TWarehouseCheckItemsDetails();
+            tWarehouseCheckItemsDetailsQuery.setfCheckFid(checkId);
+            List<TWarehouseCheckItemsDetails> tWarehouseCheckItemsDetailsList =tWarehouseCheckItemsDetailsService.selectTWarehouseCheckItemsDetailsList(tWarehouseCheckItemsDetailsQuery);
+            if(tWarehouseCheckItemsDetailsList.size()>0){
+                return AjaxResult.error("任务编号:"+checkId.intValue()+" 已存在巡检记录,无法删除");
+            }
+        }
         return toAjax(tWarehouseCheckService.deleteTWarehouseCheckByIds(fIds));
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/check/TWarehouseCheckItemsController.java

@@ -3,6 +3,8 @@ package com.ruoyi.web.controller.warehouse.check;
 import java.util.List;
 
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.warehouse.check.domain.TWarehouseCheckItemsDetails;
+import com.ruoyi.warehouse.check.service.ITWarehouseCheckItemsDetailsService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -35,6 +37,9 @@ public class TWarehouseCheckItemsController extends BaseController
     @Autowired
     private ITWarehouseCheckItemsService tWarehouseCheckItemsService;
 
+    @Autowired
+    private ITWarehouseCheckItemsDetailsService tWarehouseCheckItemsDetailsService;
+
     /**
      * 查询巡检check-item列表
      */
@@ -114,6 +119,15 @@ public class TWarehouseCheckItemsController extends BaseController
 	@DeleteMapping("/{fIds}")
     public AjaxResult remove(@PathVariable Long[] fIds)
     {
+        for (int f = 0; f < fIds.length; f++) {
+            Long itemId = fIds[f];
+            TWarehouseCheckItemsDetails tWarehouseCheckItemsDetailsQuery = new TWarehouseCheckItemsDetails();
+            tWarehouseCheckItemsDetailsQuery.setfItemFid(itemId);
+            List<TWarehouseCheckItemsDetails> tWarehouseCheckItemsDetailsList =tWarehouseCheckItemsDetailsService.selectTWarehouseCheckItemsDetailsList(tWarehouseCheckItemsDetailsQuery);
+            if(tWarehouseCheckItemsDetailsList.size()>0){
+                return AjaxResult.error("任务编号:"+itemId.intValue()+" 已存在巡检记录,无法删除");
+            }
+        }
         return toAjax(tWarehouseCheckItemsService.deleteTWarehouseCheckItemsByIds(fIds));
     }
 }

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

@@ -298,85 +298,14 @@ public class FtmsorderbillsfeesServiceImpl implements IftmsorderbillsfeesService
     public AjaxResult submitOrderbillsfeesModifyApproval(Long fId,LoginUser loginUser) {
         //暂时直接回写数据
         //先获取审批数据行
-        boolean isApprove = false;
-        Long actId = 181L;
-        Long billStatus = 4L;
-        String key = "fleet.ftmsorderbillsfees.addModify";
-        SysConfig sysConfig = sysConfigMapper.checkConfigKeyUnique(key);
-        if (StringUtils.isNull(sysConfig)) {
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            return AjaxResult.error("系统参数异常，未找到开启审批流参数");
-        }
-        if ("0".equals(sysConfig.getConfigValue())) {
-            isApprove = true;
-        }
-        if (isApprove){
-            billStatus = 4L;
-        }else {
-            billStatus = 6L;
-        }
-        //这个地方可能需要修改一下(有审批流咋处理业务没有审批流咋处理业务)
         Ftmsorderbillsfees ftmsorderbillsfees = fTmsorderbillsfeesMapper.selectFTmsorderbillsfeesModifyById(fId);
-        ftmsorderbillsfees.setfBillstatus(billStatus);
+        Long srcMId = ftmsorderbillsfees.getSrcMId();
+        ftmsorderbillsfees.setfBillstatus(6L);
         fTmsorderbillsfeesMapper.updateFTmsorderbillsfeesModify(ftmsorderbillsfees);
         //回写逻辑,srcMId返回给pId,进行绑定
-        ftmsorderbillsfees.setfPid(ftmsorderbillsfees.getSrcId());
+        ftmsorderbillsfees.setfPid(srcMId);
         ftmsorderbillsfees.setfId(null);
         fTmsorderbillsfeesMapper.insertFTmsorderbillsfees(ftmsorderbillsfees);
-        //上面赋值fPid变成空所以我重新查了一遍需要看看这个我查到的fPid是不是需要审批的那个数据
-        Ftmsorderbillsfees modify = fTmsorderbillsfeesMapper.selectFTmsorderbillsfeesModifyById(fId);
-        if (isApprove) {
-            AuditItems auditItems = new AuditItems();
-            auditItems.setLevelId(0L);
-            auditItems.setBillId(modify.getfPid());//前段查看审批需要跳转页面的参数 根据billId 查询详细数据
-            auditItems.setActId(actId);//活动号 自定义
-            auditItems.setIffinalItem("F");
-            auditItems.setBillNo(modify.getSrcBillNo());//需要将表里数据添加首页需要显示
-            // 存储委托方（货权方）
-            auditItems.setRefno1(modify.getfCorpid() + "");// 客户
-            // 存储业务类型（业务类型）
-            auditItems.setRefno2(modify.getfBilltype());//表里需要添加 前段根据这标明是那种审批 列 收费 SF
-            // 存储提单号（提单号）
-            auditItems.setRefno3(modify.getfMblno());//表里需要添加 前端页面会显示
-            auditItems.setSendUserId(loginUser.getUser().getUserId());
-            auditItems.setSendName(loginUser.getUsername());
-            auditItems.setSendTime(new Date());
-            auditItems.setAuditUserId(loginUser.getUser().getUserId());
-            auditItems.setAuditItem(new Date());
-            auditItems.setAuditOpTime(new Date());
-            auditItems.setAuditMsg("提交");
-            auditItems.setAuditStatus("O");
-            auditItems.setFidStatus("f_billstatus");
-            auditItems.setTimes(1L);
-            AjaxResult approvalFlow = auditItemsService.createApprovalFlow(auditItems);
-//            Long code = Long.valueOf(String.valueOf(approvalFlow.get("code"))).longValue();
-            String code = approvalFlow.get("code").toString();
-//                Long code = Long.valueOf(String.valueOf(ajaxResult.get("code"))).longValue();
-            if ("500".equals(code)) {
-                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            }
-            return approvalFlow;
-        }else {
-            //如果没有审批的业务处理相当于审批通过
-        }
-
         return AjaxResult.success();
-
-        /*
-        //提交审批流
-        //先获取审批数据行
-        Ftmsorderbillsfees ftmsorderbillsfees = fTmsorderbillsfeesMapper.selectFTmsorderbillsfeesModifyById(fId);
-
-        //判断审批流启动与否
-        SysConfig sysConfig = sysConfigMapper.checkConfigKeyUnique("fleet.ftmsorderbillsfees.addModify");
-        if("0".equals(sysConfig.getConfigValue())){
-            //审批流已启动
-            //创建审批流
-
-            return AjaxResult.success();
-        }else{
-            return AjaxResult.error("审批流未启动或未创建");
-        }
-         */
     }
 }

ruoyi-warehouse/src/main/java/com/ruoyi/warehouse/check/domain/TWarehouseCheck.java

@@ -9,6 +9,10 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
 /**
  * 巡检check对象 t_warehouse_check
  * 
@@ -24,6 +28,7 @@ public class TWarehouseCheck extends BaseEntity
 
     /** 仓库id */
     @Excel(name = "仓库id")
+    @NotNull(message = "仓库不能为空")
     private Long fWarehouseFid;
 
     /** 仓库名称 */

ruoyi-warehouse/src/main/resources/mapper/warehouse/TWarehouseCheckItemsDetailsMapper.xml

@@ -1,47 +1,60 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.warehouse.check.mapper.TWarehouseCheckItemsDetailsMapper">
-    
+
     <resultMap type="TWarehouseCheckItemsDetails" id="TWarehouseCheckItemsDetailsResult">
-        <result property="fId"    column="f_id"    />
-        <result property="fCheckFid"    column="f_check_fid"    />
-        <result property="fItemFid"    column="f_item_fid"    />
-        <result property="fPhotoUrl"    column="f_photo_url"    />
-        <result property="fRemark"    column="f_remark"    />
-        <result property="fCreateBy"    column="f_create_by"    />
-        <result property="fCreateTime"    column="f_create_time"    />
-        <result property="fUpdateBy"    column="f_update_by"    />
-        <result property="fUpdateTime"    column="f_update_time"    />
-        <result property="fDelFlag"    column="f_del_flag"    />
+        <result property="fId" column="f_id"/>
+        <result property="fCheckFid" column="f_check_fid"/>
+        <result property="fItemFid" column="f_item_fid"/>
+        <result property="fPhotoUrl" column="f_photo_url"/>
+        <result property="fRemark" column="f_remark"/>
+        <result property="fCreateBy" column="f_create_by"/>
+        <result property="fCreateTime" column="f_create_time"/>
+        <result property="fUpdateBy" column="f_update_by"/>
+        <result property="fUpdateTime" column="f_update_time"/>
+        <result property="fDelFlag" column="f_del_flag"/>
     </resultMap>
 
     <sql id="selectTWarehouseCheckItemsDetailsVo">
-        select f_id, f_check_fid, f_item_fid, f_photo_url, f_remark, f_create_by, f_create_time, f_update_by, f_update_time, f_del_flag from t_warehouse_check_items_details
+        select f_id,
+               f_check_fid,
+               f_item_fid,
+               f_photo_url,
+               f_remark,
+               f_create_by,
+               f_create_time,
+               f_update_by,
+               f_update_time,
+               f_del_flag
+        from t_warehouse_check_items_details
     </sql>
 
-    <select id="selectTWarehouseCheckItemsDetailsList" parameterType="TWarehouseCheckItemsDetails" resultMap="TWarehouseCheckItemsDetailsResult">
+    <select id="selectTWarehouseCheckItemsDetailsList" parameterType="TWarehouseCheckItemsDetails"
+            resultMap="TWarehouseCheckItemsDetailsResult">
         <include refid="selectTWarehouseCheckItemsDetailsVo"/>
-        <where>  
-            <if test="fCheckFid != null "> and f_check_fid = #{fCheckFid}</if>
-            <if test="fItemFid != null "> and f_item_fid = #{fItemFid}</if>
-            <if test="fPhotoUrl != null  and fPhotoUrl != ''"> and f_photo_url = #{fPhotoUrl}</if>
-            <if test="fRemark != null  and fRemark != ''"> and f_remark = #{fRemark}</if>
-            <if test="fCreateBy != null "> and f_create_by = #{fCreateBy}</if>
-            <if test="fCreateTime != null "> and f_create_time = #{fCreateTime}</if>
-            <if test="fUpdateBy != null "> and f_update_by = #{fUpdateBy}</if>
-            <if test="fUpdateTime != null "> and f_update_time = #{fUpdateTime}</if>
-            <if test="fDelFlag != null "> and f_del_flag = #{fDelFlag}</if>
+        <where>
+            <if test="fCheckFid != null ">and f_check_fid = #{fCheckFid}</if>
+            <if test="fItemFid != null ">and f_item_fid = #{fItemFid}</if>
+            <if test="fPhotoUrl != null  and fPhotoUrl != ''">and f_photo_url = #{fPhotoUrl}</if>
+            <if test="fRemark != null  and fRemark != ''">and f_remark = #{fRemark}</if>
+            <if test="fCreateBy != null ">and f_create_by = #{fCreateBy}</if>
+            <if test="fCreateTime != null ">and f_create_time = #{fCreateTime}</if>
+            <if test="fUpdateBy != null ">and f_update_by = #{fUpdateBy}</if>
+            <if test="fUpdateTime != null ">and f_update_time = #{fUpdateTime}</if>
+            <if test="fDelFlag != null ">and f_del_flag = #{fDelFlag}</if>
         </where>
     </select>
-    
-    <select id="selectTWarehouseCheckItemsDetailsById" parameterType="Long" resultMap="TWarehouseCheckItemsDetailsResult">
+
+    <select id="selectTWarehouseCheckItemsDetailsById" parameterType="Long"
+            resultMap="TWarehouseCheckItemsDetailsResult">
         <include refid="selectTWarehouseCheckItemsDetailsVo"/>
         where f_id = #{fId}
     </select>
-        
-    <insert id="insertTWarehouseCheckItemsDetails" parameterType="TWarehouseCheckItemsDetails" useGeneratedKeys="true" keyProperty="fId">
+
+    <insert id="insertTWarehouseCheckItemsDetails" parameterType="TWarehouseCheckItemsDetails" useGeneratedKeys="true"
+            keyProperty="fId">
         insert into t_warehouse_check_items_details
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="fCheckFid != null">f_check_fid,</if>
@@ -53,7 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fUpdateBy != null">f_update_by,</if>
             <if test="fUpdateTime != null">f_update_time,</if>
             <if test="fDelFlag != null">f_del_flag,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="fCheckFid != null">#{fCheckFid},</if>
             <if test="fItemFid != null">#{fItemFid},</if>
@@ -64,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fUpdateBy != null">#{fUpdateBy},</if>
             <if test="fUpdateTime != null">#{fUpdateTime},</if>
             <if test="fDelFlag != null">#{fDelFlag},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateTWarehouseCheckItemsDetails" parameterType="TWarehouseCheckItemsDetails">
@@ -84,14 +97,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteTWarehouseCheckItemsDetailsById" parameterType="Long">
-        delete from t_warehouse_check_items_details where f_id = #{fId}
+        delete
+        from t_warehouse_check_items_details
+        where f_id = #{fId}
     </delete>
 
     <delete id="deleteTWarehouseCheckItemsDetailsByIds" parameterType="String">
-        delete from t_warehouse_check_items_details where f_id in 
+        delete from t_warehouse_check_items_details where f_id in
         <foreach item="fId" collection="array" open="(" separator="," close=")">
             #{fId}
         </foreach>
     </delete>
-    
+
 </mapper>