Merge remote-tracking branch 'origin/dev_v1.0.0' into dev_v1.0.0

sop-api/src/main/java/com/qmth/sop/server/api/TBProductController.java

@@ -6,6 +6,7 @@ import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.sop.business.entity.TBProduct;
 import com.qmth.sop.business.service.TBProductService;
 import com.qmth.sop.common.contant.SystemConstant;
+import com.qmth.sop.common.enums.ProductTypeEnum;
 import com.qmth.sop.common.util.Result;
 import com.qmth.sop.common.util.ResultUtil;
 import io.swagger.annotations.*;
@@ -15,7 +16,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import java.util.Objects;
 
 
 /**
@@ -39,8 +39,15 @@ public class TBProductController {
     @ApiOperation(value = "获取产品信息列表接口")
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @ApiResponses({@ApiResponse(code = 200, message = "产品信息列表", response = TBProduct.class)})
-    public Result list(@ApiParam(value = "是否启用", required = false) @RequestParam(required = false) Boolean enable) {
-        return ResultUtil.ok(tbProductService.list(new QueryWrapper<TBProduct>().lambda().eq(Objects.nonNull(enable), TBProduct::getEnable, enable)));
+    public Result list(@ApiParam(value = "是否启用") @RequestParam(required = false) Boolean enable,
+                       @ApiParam(value = "产品类型") @RequestParam(required = false) ProductTypeEnum productType) {
+        QueryWrapper<TBProduct> queryWrapper = new QueryWrapper<>();
+        if (enable != null) {
+            queryWrapper.lambda().eq(TBProduct::getEnable, enable);
+        }
+        if (productType != null) {
+            queryWrapper.lambda().eq(TBProduct::getCode, productType);
+        }
+        return ResultUtil.ok(tbProductService.list(queryWrapper));
     }
-
 }

sop-business/src/main/java/com/qmth/sop/business/bean/result/TBDingAttendanceResult.java

@@ -89,6 +89,14 @@ public class TBDingAttendanceResult implements Serializable {
     @ExcelIgnore
     private Long coordinatorId;
 
+    @ApiModelProperty(value = "打卡地址X轴")
+    @ExcelIgnore
+    private String axisX;
+
+    @ApiModelProperty(value = "打卡地址Y轴")
+    @ExcelIgnore
+    private String axisY;
+
     public String getService() {
         return service;
     }
@@ -216,4 +224,20 @@ public class TBDingAttendanceResult implements Serializable {
     public void setCoordinatorId(Long coordinatorId) {
         this.coordinatorId = coordinatorId;
     }
+
+    public String getAxisX() {
+        return axisX;
+    }
+
+    public void setAxisX(String axisX) {
+        this.axisX = axisX;
+    }
+
+    public String getAxisY() {
+        return axisY;
+    }
+
+    public void setAxisY(String axisY) {
+        this.axisY = axisY;
+    }
 }

sop-business/src/main/resources/mapper/TBCrmMapper.xml

@@ -143,7 +143,7 @@
             AND tbc.enable
             AND tbc.service_id IS NULL
             <if test="crmUserId != null">
-                AND tbc.custom_id = #{crmUserId}
+                AND tbc.crm_user_id = #{crmUserId}
             </if>
             <if test="productType != null">
                 AND sc.type = #{productType}

sop-business/src/main/resources/mapper/TBDingMapper.xml

@@ -256,6 +256,8 @@
         d.sign_time,
         CASE WHEN d.sign_time IS NOT NULL THEN 'NORMAL' ELSE 'ABNORMAL' END STATUS,
         d.address,
+        d.axis_x AS axisX,
+        d.axis_y AS axisY,
         d.service_id,
         s.id supplier_id ,
         d.user_id,
@@ -264,8 +266,8 @@
         crm.region_coordinator_id AS coordinatorId
         FROM
         (
-        SELECT d.*,d.sign_in_address address, d.sign_in_time sign_time,'IN' AS type FROM t_b_ding d UNION ALL
-        SELECT d.*,d.sign_out_address address, d.sign_out_time sign_time,'OUT' AS type FROM t_b_ding d
+        SELECT d.*,d.axis_in_x AS axis_x, d.axis_in_y AS axis_y,d.sign_in_address address, d.sign_in_time sign_time,'IN' AS type FROM t_b_ding d UNION ALL
+        SELECT d.*,d.axis_out_x AS axis_x, d.axis_out_y AS axis_y,d.sign_out_address address, d.sign_out_time sign_time,'OUT' AS type FROM t_b_ding d
         ) d
         LEFT JOIN t_b_user_archives ua ON ua.id = d.user_archives_id
         LEFT JOIN t_b_user_archives_supplier us ON us.user_archives_id = ua.id