需求

mall-server-api/src/main/java/com/gree/mall/manager/bean/worker/WorkerWarrantyVO.java

@@ -0,0 +1,85 @@
+package com.gree.mall.manager.bean.worker;
+
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.gree.mall.manager.annotation.ZfireField;
+import com.gree.mall.manager.plus.entity.WorkerWarranty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@ApiModel
+@ZfireField(tbName = "a")
+public class WorkerWarrantyVO   {
+
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "质保id")
+    @TableId(value = "warranty_id", type = IdType.ID_WORKER_STR)
+    private String warrantyId;
+
+    @ApiModelProperty(value = "网点编号")
+    private String websitId;
+
+    @ApiModelProperty(value = "师傅编号")
+    private String workerNumber;
+
+
+    @ApiModelProperty(value = "工程师名称")
+    private String workerName;
+
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "工程师id")
+    private String workerId;
+
+    @ApiModelProperty(value = "身份证号")
+    private String idCard;
+
+    @ApiModelProperty(value = "微信手机号")
+    private String mobile;
+
+    @ApiModelProperty(value = "入职时间")
+    private Date inTime;
+
+    @ApiModelProperty(value = "离职时间")
+    private Date outTime;
+
+    @ApiModelProperty(value = "应缴金额")
+    private BigDecimal shouldAmount;
+
+    @ApiModelProperty(value = "已缴纳金额")
+    private BigDecimal payableAmount;
+
+    @ApiModelProperty(value = "待缴纳金额")
+    private BigDecimal waitAmount;
+
+    @ApiModelProperty(value = "已缴纳期数")
+    private Integer payableNum;
+
+    @ApiModelProperty(value = "退款金额")
+    private BigDecimal refundAmount;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    @ApiModelProperty(value = "创建人")
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    @ApiModelProperty(value = "修改时间")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    @ApiModelProperty(value = "修改人")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateBy;
+
+
+}

mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/NoticeRecordBeanMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.manager.bean.notice.*;
+import com.gree.mall.manager.bean.worker.WorkerWarrantyVO;
 import com.gree.mall.manager.zfire.bean.ZfireParamBean;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -42,4 +43,7 @@ public interface NoticeRecordBeanMapper {
 
     @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<NoticeWebsitRecordVO> listWebsit(Page page,@Param("ex") ZfireParamBean zfireParam,@Param("adminCompanyIds")  List<String> adminCompanyIds);
+
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
+    IPage<WorkerWarrantyVO> listWarranty(Page page,@Param("ex")  ZfireParamBean zfireParam,@Param("adminCompanyIds")  List<String> adminCompanyIds);
 }

mall-server-api/src/main/java/com/gree/mall/manager/controller/worker/WorkerWarrantyController.java

@@ -0,0 +1,78 @@
+package com.gree.mall.manager.controller.worker;
+
+import cn.hutool.core.lang.TypeReference;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gree.mall.manager.annotation.ZfireList;
+import com.gree.mall.manager.bean.notice.NoticeWebsitBean;
+import com.gree.mall.manager.bean.notice.NoticeWebsitVO;
+import com.gree.mall.manager.bean.worker.WebsitWorkerBean;
+import com.gree.mall.manager.bean.worker.WorkerTeamVO;
+import com.gree.mall.manager.bean.worker.WorkerWarrantyVO;
+import com.gree.mall.manager.exception.RemoteServiceException;
+import com.gree.mall.manager.helper.ResponseHelper;
+import com.gree.mall.manager.logic.notice.NoticeWebsitLogic;
+import com.gree.mall.manager.logic.worker.WorkerTeamLogic;
+import com.gree.mall.manager.logic.worker.WorkerWarrantyLogic;
+import com.gree.mall.manager.plus.entity.NoticeWebsit;
+import com.gree.mall.manager.plus.entity.WorkerTeam;
+import com.gree.mall.manager.zfire.bean.WorkerTeamParamBean;
+import com.gree.mall.manager.zfire.bean.ZfireParamBean;
+import com.gree.mall.manager.zfire.util.FieldUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+@Slf4j
+@RestController
+@Api(value = "质保金", tags = {"质保金账单"})
+@RequestMapping(value = "/worker/warranty", produces = "application/json; charset=utf-8")
+public class WorkerWarrantyController {
+
+    @Autowired
+    private WorkerWarrantyLogic workerWarrantyLogic;
+
+
+    @ZfireList
+    @PostMapping("/list")
+    @ApiOperation(value = "质保金列表")
+    public ResponseHelper<IPage<WorkerWarrantyVO>> list(
+            @RequestBody ZfireParamBean zfireParamBean
+    ) throws RemoteServiceException {
+        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean);
+        IPage<WorkerWarrantyVO> stockBeanIPage = workerWarrantyLogic.list(new Page(zfireParam.getPageNum(), zfireParam.getPageSize()), zfireParam);
+        return ResponseHelper.success(stockBeanIPage, new TypeReference<WorkerWarrantyVO>() {});
+    }
+
+    @PostMapping("/list/export")
+    @ApiOperation(value = "质保金列表导出")
+    public void listExport(
+            @RequestBody ZfireParamBean zfireParamBean,
+            HttpServletRequest request,
+            HttpServletResponse response
+    ) throws Exception {
+        //1.组装查询条件
+        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean);
+        //2.查询要导出的内容
+        IPage<WorkerWarrantyVO> stockBeanIPage = workerWarrantyLogic.list(new Page(zfireParam.getPageNum(), zfireParam.getPageSize()), zfireParam);
+        //3.导出
+        FieldUtils.exportData(stockBeanIPage.getRecords(), zfireParam.getExportFields(), request, response);
+    }
+
+
+/*    @PostMapping("/refund")
+    @ApiOperation(value = "退款")
+    public ResponseHelper refund(@RequestBody NoticeWebsitBean noticeBean) {
+        workerWarrantyLogic.refund(noticeBean);
+        return ResponseHelper.success();
+    }*/
+}

mall-server-api/src/main/java/com/gree/mall/manager/logic/worker/WorkerWarrantyLogic.java

@@ -0,0 +1,43 @@
+package com.gree.mall.manager.logic.worker;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gree.mall.manager.bean.admin.AdminUserCom;
+import com.gree.mall.manager.bean.notice.NoticeWebsitVO;
+import com.gree.mall.manager.bean.worker.WorkerWarrantyVO;
+import com.gree.mall.manager.commonmapper.NoticeRecordBeanMapper;
+import com.gree.mall.manager.logic.common.CommonLogic;
+import com.gree.mall.manager.zfire.bean.ZfireParamBean;
+import com.gree.mall.manager.zfire.util.FieldUtils;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+@Slf4j
+@RequiredArgsConstructor
+public class WorkerWarrantyLogic {
+
+    @Autowired
+    NoticeRecordBeanMapper noticeRecordMapper;
+
+    @Autowired
+    CommonLogic commonLogic;
+
+    public IPage<WorkerWarrantyVO> list(Page page, ZfireParamBean zfireParam) {
+
+        //获取当前登录企业id
+        AdminUserCom adminUser = commonLogic.getAdminUser();
+
+        List<String> adminCompanyIds = adminUser.getCompanyWechatIds();
+        //1.组装查询条件
+        zfireParam = FieldUtils.supplyParam(zfireParam, WorkerWarrantyVO.class,adminUser);
+
+        IPage<WorkerWarrantyVO> workerWarrantyVOIPage = noticeRecordMapper.listWarranty(new Page(zfireParam.getPageNum(), zfireParam.getPageSize()), zfireParam, adminCompanyIds);
+
+        return workerWarrantyVOIPage;
+    }
+}

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/ChangeOrderLogic.java

@@ -195,6 +195,9 @@ public class ChangeOrderLogic {
             }
         }
 
+        if (CollectionUtils.isEmpty(orderIds))
+            return;
+
 
         pgOrderBaseService.lambdaUpdate()
                 .in(PgOrderBase::getId, orderIds)

mall-server-api/src/main/resources/mapper/NoticeRecordBeanMapper.xml

@@ -125,5 +125,29 @@
             order by a.create_time desc
         </if>
     </select>
+    <select id="listWarranty" resultType="com.gree.mall.manager.bean.worker.WorkerWarrantyVO">
+        SELECT
+        a.*
+        FROM
+        worker_warranty a
+        ${ex.query}
+        <if test="adminCompanyIds != null and adminCompanyIds.size > 0">
+            and a.company_wechat_id  in
+            <foreach item="item" index="index" collection="adminCompanyIds" open="(" separator=","
+                     close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="ex.adminWebsitIds != null and ex.adminWebsitIds.size > 0">
+            AND a.websit_id IN
+            <foreach item="item" index="index" collection="ex.adminWebsitIds" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        ${ex.orderBy}
+        <if test="ex.orderBy == null or  ex.orderBy == ''">
+            order by a.create_time desc
+        </if>
+    </select>
 
 </mapper>