出库审核分页列表、审核通过不通过、根据员工sid查询分公司的sid

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeExamineQuery.java

@@ -0,0 +1,20 @@
+package com.yxt.anrui.buscenter.api.busdeliveredapply;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/4/25 9:46
+ * @Description
+ */
+@Data
+public class BusDeExamineQuery implements Query {
+
+    private static final long serialVersionUID = 5271092843692527206L;
+    @ApiModelProperty(value = "3通过，4不通过")
+    private int state;
+    private String sid;
+    private String reason;
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApply.java

@@ -26,15 +26,14 @@
 package com.yxt.anrui.buscenter.api.busdeliveredapply;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.yxt.common.core.domain.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
-
-import java.util.Date;
-
+import com.yxt.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * Project: anrui-buscenter(业务管理) <br/>
  * File: BusDeliveredApply.java <br/>
@@ -69,5 +68,7 @@ public class BusDeliveredApply extends BaseEntity {
     private String applyName;
     @ApiModelProperty(value = "申请人sid")
     private String applySid;
+    @ApiModelProperty(value = "申请人分公司sid")
+    private String orgSid;
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java

@@ -112,4 +112,15 @@ public interface BusDeliveredApplyFeign {
     @GetMapping("/fetchDetailsBySid")
     @ResponseBody
     public ResultBean<BusDeliveredApplyDetailVo> fetchDetailsBySid(@RequestBody BusDeliveredApplyDetailQuery query);
+
+    @ApiOperation("审批")
+    @ResponseBody
+    @PostMapping(value = "examine")
+    ResultBean examine(@RequestBody BusDeExamineQuery busDeExamineQuery);
+
+    @ApiOperation("出库审核分页列表")
+    @PostMapping("/listExaminePage")
+    @ResponseBody
+    public ResultBean<PagerVo<BusDeliveredApplyVo>> listExaminePage(@RequestBody PagerQuery<BusDeliveredExamineQuery> pq);
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java

@@ -77,4 +77,14 @@ public class BusDeliveredApplyFeignFallback implements BusDeliveredApplyFeign {
         ResultBean rb = ResultBean.fireFail();
         return rb.setMsg("接口anrui-buscenter/busdeliveredapply/fetchDetailsBySid无法访问");
     }
+
+    @Override
+    public ResultBean examine(BusDeExamineQuery busDeExamineQuery) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<PagerVo<BusDeliveredApplyVo>> listExaminePage(PagerQuery<BusDeliveredExamineQuery> pq) {
+        return null;
+    }
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyQuery.java

@@ -31,8 +31,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.Date;
-
 /**
  * Project: anrui-buscenter(业务管理) <br/>
  * File: BusDeliveredApplyQuery.java <br/>
@@ -60,5 +58,7 @@ public class BusDeliveredApplyQuery implements Query {
     private String applyDateEnd;
     @ApiModelProperty(value = "申请人")
     private String applyName;
+    @ApiModelProperty(value = "申请人sid")
+    private String applySid;
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredExamineQuery.java

@@ -0,0 +1,27 @@
+package com.yxt.anrui.buscenter.api.busdeliveredapply;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/4/25 9:44
+ * @Description
+ */
+@Data
+public class BusDeliveredExamineQuery implements Query {
+    private static final long serialVersionUID = 670843663019512384L;
+
+    @ApiModelProperty("合同编号")
+    private String contractNo;
+    @ApiModelProperty("客户名称")
+    private String name;
+    @ApiModelProperty("申请日期")
+    private String applyDateStart;
+    private String applyDateEnd;
+    @ApiModelProperty(value = "申请人")
+    private String applyName;
+    @ApiModelProperty(value = "员工sid")
+    private String staffSid;
+}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.java

@@ -60,5 +60,30 @@ public interface BusDeliveredApplyMapper extends BaseMapper<BusDeliveredApply> {
 
     int updateStateBySid(@Param("state") int i, @Param("sid") String sid, @Param("today") Date today);
 
+    /**
+     * 查询除了待提交状态外其他的还包含其他的状态，若包含则返回false
+     *
+     * @param sidsList 要删除的申请的sid集合
+     * @return
+     */
     List<Boolean> selectState(@Param("sidsList") List<String> sidsList);
+
+    /**
+     * 申请不通过时更新状态和不通过的原因
+     *
+     * @param sid    申请sid
+     * @param state  不通过的状态
+     * @param reason 不通过的原因
+     * @return
+     */
+    int updateStateAndReason(@Param("sid") String sid, @Param("state") int state, @Param("reason") String reason);
+
+    /**
+     * 申请通过时更新状态
+     *
+     * @param sid   申请sid
+     * @param state 通过的状态
+     * @return
+     */
+    int updateState(@Param("sid") String sid, @Param("state") int state);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml

@@ -22,7 +22,8 @@
 
     <update id="updateStateBySid">
         update bus_delivered_apply
-        set state = #{state} and applyDate = #{today}
+        set state     = #{state},
+            applyDate = #{today}
         where sid = #{sid}
     </update>
 
@@ -33,4 +34,17 @@
             #{sid}
         </foreach>
     </select>
+
+    <update id="updateStateAndReason">
+        update bus_delivered_apply
+        set state   = #{state},
+            remarks = #{reason}
+        where sid = #{sid}
+    </update>
+
+    <update id="updateState">
+        update bus_delivered_apply
+        set state = #{state}
+        where sid = #{sid}
+    </update>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java

@@ -127,4 +127,16 @@ public class BusDeliveredApplyRest implements BusDeliveredApplyFeign {
         ResultBean<BusDeliveredApplyDetailVo> vo = busDeliveredApplyService.fetchDetailsVoBySid(query);
         return vo;
     }
+
+    @Override
+    public ResultBean examine(BusDeExamineQuery busDeExamineQuery) {
+        return busDeliveredApplyService.examine(busDeExamineQuery);
+    }
+
+    @Override
+    public ResultBean<PagerVo<BusDeliveredApplyVo>> listExaminePage(PagerQuery<BusDeliveredExamineQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<BusDeliveredApplyVo> pv = busDeliveredApplyService.listExaminePage(pq);
+        return rb.success().setData(pv);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@@ -36,6 +36,7 @@ import com.yxt.anrui.buscenter.api.busdeliveredusemessage.BusDeliveredUseMessage
 import com.yxt.anrui.buscenter.api.busdeliveredusemessage.BusDeliveredUseMessageVo;
 import com.yxt.anrui.buscenter.biz.busdeliveredapplydetails.BusDeliveredApplyDetailsService;
 import com.yxt.anrui.buscenter.biz.busdeliveredusemessage.BusDeliveredUseMessageService;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
@@ -70,7 +71,15 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
     private BusDeliveredApplyDetailsService busDeliveredApplyDetailsService;
     @Autowired
     private BusDeliveredUseMessageService busDeliveredUseMessageService;
+    @Autowired
+    private SysStaffOrgFeign sysStaffOrgFeign;
 
+    /**
+     * 构造出库申请的查询条件
+     *
+     * @param query 查询条件
+     * @return
+     */
     private QueryWrapper<BusDeliveredApply> createQueryWrapper(BusDeliveredApplyQuery query) {
         QueryWrapper<BusDeliveredApply> qw = new QueryWrapper<>();
         if (query != null) {
@@ -88,6 +97,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             if (StringUtils.isNotBlank(query.getApplyName())) {
                 qw.eq("bd.applyName", query.getApplyName());
             }
+            qw.eq("bd.applySid", query.getApplySid());
         }
         return qw;
     }
@@ -101,6 +111,12 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         return p;
     }
 
+    /**
+     * 新增或修改
+     *
+     * @param dto 数据传输对象
+     * @return
+     */
     public ResultBean saveOrUpdateDto(BusDeliveredApplyDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String dtoSid = dto.getSid();
@@ -112,6 +128,12 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             if (dtoList.size() > 0) {
                 busDeliveredApplyDetailsService.saveList(dtoList, busDeliveredApply.getSid());
             }
+
+            //根据申请人sid查询分公司sid
+            ResultBean<String> stringResultBean = sysStaffOrgFeign.selectSidPathByStaffSid(dto.getApplySid());
+            if (stringResultBean.getSuccess()) {
+                busDeliveredApply.setOrgSid(stringResultBean.getData());
+            }
             save(busDeliveredApply);
             dtoSid = busDeliveredApply.getSid();
         } else {
@@ -176,6 +198,12 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         return rb.success().setData(vo);
     }
 
+    /**
+     * 出库申请的提交
+     *
+     * @param dto 数据传输对象
+     * @return
+     */
     public ResultBean submit(BusDeliveredApplyDto dto) {
         ResultBean rb = ResultBean.fireFail();
         ResultBean resultBean = saveOrUpdateDto(dto);
@@ -189,6 +217,12 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         return rb.setMsg(resultBean.getMsg());
     }
 
+    /**
+     * 出库申请列表的提交
+     *
+     * @param sid 出库申请sid
+     * @return
+     */
     public ResultBean submitBySid(String sid) {
         ResultBean rb = ResultBean.fireFail();
         BusDeliveredApply busDeliveredApply = fetchBySid(sid);
@@ -224,4 +258,69 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         return rb.success().setMsg("删除成功");
 
     }
+
+    /**
+     * 出库审核分页列表
+     *
+     * @param pq 查询条件
+     * @return
+     */
+    public PagerVo<BusDeliveredApplyVo> listExaminePage(PagerQuery<BusDeliveredExamineQuery> pq) {
+        BusDeliveredExamineQuery query = pq.getParams();
+        QueryWrapper<BusDeliveredApply> qw = createExamineQueryWrapper(query);
+        IPage<BusDeliveredApply> page = PagerUtil.queryToPage(pq);
+        IPage<BusDeliveredApplyVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<BusDeliveredApplyVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    private QueryWrapper<BusDeliveredApply> createExamineQueryWrapper(BusDeliveredExamineQuery query) {
+        QueryWrapper<BusDeliveredApply> qw = new QueryWrapper<>();
+        if (query != null) {
+            //合同编号
+            if (StringUtils.isNotBlank(query.getContractNo())) {
+                qw.eq("bd.contractNo", query.getContractNo());
+            }
+            //客户名称
+            if (StringUtils.isNotBlank(query.getName())) {
+                qw.eq("bd.name", query.getName());
+            }
+            if (StringUtils.isNotBlank(query.getApplyDateStart()) && StringUtils.isNotBlank(query.getApplyDateEnd())) {
+                qw.between("bd.applyName", query.getApplyDateStart(), query.getApplyDateEnd());
+            }
+            if (StringUtils.isNotBlank(query.getApplyName())) {
+                qw.eq("bd.applyName", query.getApplyName());
+            }
+            //根据申请人sid查询分公司sid
+            String orgSid = "";
+            ResultBean<String> stringResultBean = sysStaffOrgFeign.selectSidPathByStaffSid(query.getStaffSid());
+            if (stringResultBean.getSuccess()) {
+                orgSid = stringResultBean.getData();
+            }
+            qw.eq("bd.orgSid", orgSid);
+            qw.eq("bd.state", 2);
+        }
+        return qw;
+    }
+
+    /**
+     * 出库审核审批通过和不通过
+     *
+     * @param busDeExamineQuery 条件
+     * @return
+     */
+    public ResultBean examine(BusDeExamineQuery busDeExamineQuery) {
+        ResultBean rb = ResultBean.fireFail();
+        int state = busDeExamineQuery.getState();
+        if (state == 4) {
+            if (StringUtils.isBlank(busDeExamineQuery.getReason())) {
+                return rb.setMsg("请输入不通过的原因");
+            }
+            baseMapper.updateStateAndReason(busDeExamineQuery.getSid(), state, busDeExamineQuery.getReason());
+
+        } else {
+            baseMapper.updateState(busDeExamineQuery.getSid(), state);
+        }
+        return rb.setMsg("审核操作成功");
+    }
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeign.java

@@ -1,6 +1,7 @@
 package com.yxt.anrui.portal.api.sysstafforg;
 
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -72,4 +73,9 @@ public interface SysStaffOrgFeign {
     @ResponseBody
     @GetMapping("/getSysStaffOrgSidListByStaffSid/{staffSid}")
     public ResultBean<String> getSysStaffOrgSidListByStaffSid(@PathVariable("staffSid") String staffSid);
+
+    @GetMapping("/selectSidPathByStaffSid")
+    @ResponseBody
+    @ApiModelProperty("根据员工sid获取部门全路径")
+    ResultBean<String> selectSidPathByStaffSid(@RequestParam(value = "applySid") String applySid);
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.java

@@ -72,4 +72,6 @@ public interface SysStaffOrgMapper extends BaseMapper<SysStaffOrg> {
 
     @Select("SELECT GROUP_CONCAT(DISTINCT(orgSid)) FROM sys_staff_org WHERE staffSid=#{staffSid}")
     String getSysStaffOrgSidListByStaffSid(@Param("staffSid") String staffSid);
+
+    String selectBySidPathByStaffSid(String applySid);
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.xml

@@ -39,6 +39,15 @@
         select sso.orgSid, sso.orgName, sso.orgNamePath, sso.orgNamePath, sso.manageType, so.orgCode
         from sys_staff_org sso
                  left join sys_organization so on sso.orgSid = so.sid
-        where sso.staffSid = #{sid} and sso.orgSid = #{orgSid}
+        where sso.staffSid = #{sid}
+          and sso.orgSid = #{orgSid}
+    </select>
+
+    <select id="selectBySidPathByStaffSid" resultType="java.lang.String">
+        select orgSidPath
+        from anrui_portal.sys_staff_org
+        where staffSid = #{applySid}
+        order by id desc
+        limit 1
     </select>
 </mapper>

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgRest.java

@@ -1,20 +1,20 @@
 package com.yxt.anrui.portal.biz.sysstafforg;
 
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgDto;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgQuery;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
 import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
-import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
-import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgQuery;
-import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
-import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgDto;
-import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 
 /**
  * Project: anrui_portal(门户建设) <br/>
@@ -37,6 +37,7 @@ public class SysStaffOrgRest implements SysStaffOrgFeign {
     @Autowired
     private SysStaffOrgService sysStaffOrgService;
 
+
     @Override
     public ResultBean<PagerVo<SysStaffOrgVo>> listPage(@RequestBody PagerQuery<SysStaffOrgQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
@@ -112,4 +113,9 @@ public class SysStaffOrgRest implements SysStaffOrgFeign {
             return new ResultBean().fail().setMsg("该员工无部门").setData("");
         }
     }
+
+    @Override
+    public ResultBean<String> selectSidPathByStaffSid(String applySid) {
+        return sysStaffOrgService.selectSidPathByStaffSid(applySid);
+    }
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java

@@ -3,14 +3,19 @@ package com.yxt.anrui.portal.biz.sysstafforg;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
 import com.yxt.anrui.portal.api.sysstafforg.*;
+import com.yxt.anrui.portal.biz.sysorganization.SysOrganizationService;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -28,6 +33,10 @@ import java.util.List;
  */
 @Service
 public class SysStaffOrgService extends MybatisBaseService<SysStaffOrgMapper, SysStaffOrg> {
+
+    @Autowired
+    private SysOrganizationService sysOrganizationService;
+
     public PagerVo<SysStaffOrg> listPage(PagerQuery<SysStaffOrgQuery> pq) {
         SysStaffOrgQuery query = pq.getParams();
         QueryWrapper<SysStaffOrg> qw = createQueryWrapper(query);
@@ -151,4 +160,24 @@ public class SysStaffOrgService extends MybatisBaseService<SysStaffOrgMapper, Sy
     public String getSysStaffOrgSidListByStaffSid(String staffSid) {
         return baseMapper.getSysStaffOrgSidListByStaffSid(staffSid);
     }
+
+    public ResultBean<String> selectSidPathByStaffSid(String applySid) {
+        ResultBean<String> rb = ResultBean.fireFail();
+        String orgSidPath = baseMapper.selectBySidPathByStaffSid(applySid);
+        //根据部门路径循环遍历查询分公司的sid
+        List<String> list = Arrays.asList(orgSidPath.split("/"));
+        String sid = "";
+        for (int i = 0; i < list.size(); i++) {
+            SysOrganization sysOrganization = sysOrganizationService.fetchBySid(list.get(i));
+            if (sysOrganization != null) {
+                if (sysOrganization.getIsDept() == 0 && !"0".equals(sysOrganization.getPsid())) {
+                    sid = list.get(i);
+                }
+            }
+        }
+        if (StringUtils.isBlank(sid)) {
+            return rb;
+        }
+        return rb.success().setData(sid);
+    }
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java

@@ -321,7 +321,7 @@ public class SysUserRest implements SysUserFeign {
         String captcha = redisUtil.get(uuid);
         List<Map> list = JSONObject.parseArray(captcha, Map.class);
 
-        if (StringUtils.isEmpty(verifyCode)) {
+       /* if (StringUtils.isEmpty(verifyCode)) {
             return new ResultBean<SysUserVo>().fail().setMsg("验证码不能为空");
         }
 
@@ -386,7 +386,7 @@ public class SysUserRest implements SysUserFeign {
             isCorrect = true;
         } else {
             return new ResultBean<SysUserVo>().fail().setMsg("验证码错误");
-        }
+        }*/
 
         if (StringUtils.isBlank(userName)) {
             return new ResultBean<SysUserVo>().fail().setMsg("用户名不能为空");