修复定位打卡BUG、品牌物料BUG修复

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataBrandCategoryVO.java

@@ -31,4 +31,9 @@ import lombok.EqualsAndHashCode;
 public class BasicdataBrandCategoryVO extends BasicdataBrandCategoryEntity {
 	private static final long serialVersionUID = 1L;
 
+	private String brandName;
+	private String name;
+
+
+
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataBrandCategoryMapper.java

@@ -34,14 +34,6 @@ import java.util.List;
  */
 public interface BasicdataBrandCategoryMapper extends BaseMapper<BasicdataBrandCategoryEntity> {
 
-	/**
-	 * 自定义分页
-	 *
-	 * @param page
-	 * @param basicdataBrandCategory
-	 * @return
-	 */
-	List<BasicdataBrandCategoryVO> selectBasicdataBrandCategoryPage(IPage page, BasicdataBrandCategoryVO basicdataBrandCategory);
 
 
 	/**
@@ -52,4 +44,11 @@ public interface BasicdataBrandCategoryMapper extends BaseMapper<BasicdataBrandC
 	 */
 	List<BasicdataBrandCategoryExcel> exportBasicdataBrandCategory(@Param("ew") Wrapper<BasicdataBrandCategoryEntity> queryWrapper);
 
+	/**
+	 * 分页
+	 * @param page
+	 * @param basicdataBrandCategory
+	 * @return
+	 */
+	IPage<BasicdataBrandCategoryVO> selectBasicdataBrandCategoryPage(IPage<BasicdataBrandCategoryVO> page, BasicdataBrandCategoryVO basicdataBrandCategory);
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataBrandCategoryMapper.xml

@@ -24,13 +24,25 @@
     </resultMap>
 
 
-    <select id="selectBasicdataBrandCategoryPage" resultMap="basicdataBrandCategoryResultMap">
-        select * from logpm_basicdata_brand_category where is_deleted = 0
-    </select>
+
 
 
     <select id="exportBasicdataBrandCategory" resultType="com.logpm.basicdata.excel.BasicdataBrandCategoryExcel">
         SELECT * FROM logpm_basicdata_brand_category ${ew.customSqlSegment}
     </select>
+    <select id="selectBasicdataBrandCategoryPage" resultType="com.logpm.basicdata.vo.BasicdataBrandCategoryVO">
+        SELECT
+        lbbc.id ,
+        lbb.brand_name AS brandName,
+        lbc.`name` AS name,
+        lbb.id AS brandId,
+        lbc.id AS categoryId
+        FROM
+        logpm_basicdata_brand_category AS lbbc
+        LEFT JOIN logpm_basicdata_brand AS lbb ON lbbc.brand_id = lbb.id
+        LEFT JOIN logpm_basicdata_category AS lbc  ON lbbc.category_id = lbc.id
+        GROUP BY
+        lbbc.id
+    </select>
 
 </mapper>

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientMapper.xml

@@ -106,6 +106,8 @@
         SELECT
         lbc.id,
         lbc.client_name,
+        lbc.create_time,
+        lbc.update_time,
         lbc. client_type,
         lbc.client_code,
         lbc. linkman,

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTripartiteMallMapper.xml

@@ -69,6 +69,8 @@
         lbtm.tripartite_coding,
         lbtm.brand_name,
         lbc.client_name AS clientName,
+        lbc.create_time AS createTime,
+        lbc.update_time AS updateTime,
         lbc.type_service AS typeService
         FROM
         logpm_basicdata_tripartite_mall AS lbtm

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataBrandCategoryServiceImpl.java

@@ -39,7 +39,7 @@ public class BasicdataBrandCategoryServiceImpl extends BaseServiceImpl<Basicdata
 
 	@Override
 	public IPage<BasicdataBrandCategoryVO> selectBasicdataBrandCategoryPage(IPage<BasicdataBrandCategoryVO> page, BasicdataBrandCategoryVO basicdataBrandCategory) {
-		return page.setRecords(baseMapper.selectBasicdataBrandCategoryPage(page, basicdataBrandCategory));
+		return baseMapper.selectBasicdataBrandCategoryPage(page, basicdataBrandCategory);
 	}
 
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml

@@ -779,7 +779,7 @@
         logpm_distribution_signfor lds
         JOIN logpm_distribution_delivery_list lddl ON lddl.id = lds.delivery_id
         JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id AND ldr.reservation_status != 40
-        LEFT JOIN logpm_distribution_positioning AS ldp ON lds.reservation_id = lds.reservation_id AND ldp.is_deleted = 0
+        LEFT JOIN logpm_distribution_positioning AS ldp ON ldp.reservation_id = lds.reservation_id AND ldp.is_deleted = 0
         where lds.is_deleted = 0 and lds.id = #{id}
     </select>