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

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

@@ -151,18 +151,21 @@
             <if test="param.clientType != null and param.clientType != ''">
                 AND lbc.client_type = #{param.clientType}
             </if>
-            <if test="param.contractStartTime != null and param.contractStartTime != ''">
-                AND DATE_FORMAT(lbc.contract_start_time,, '%Y-%m-%d') > DATE_FORMAT(#{param.contractStartTime}, '%Y-%m-%d')
-            </if>
-            <if test="param.contractEntTime != null and param.contractEntTime != ''">
-                AND DATE_FORMAT(lbc.contract_ent_time,, '%Y-%m-%d') &lt; DATE_FORMAT(#{param.contractEntTime}, '%Y-%m-%d')
+            <if test="param.typeServiceName != null and param.typeServiceName != ''">
+                AND lbc.type_ervice = #{param.typeServiceName}
             </if>
+<!--            <if test="param.contractStartTime != null and param.contractStartTime != ''">-->
+<!--                AND DATE_FORMAT(lbc.contract_start_time,, '%Y-%m-%d') > DATE_FORMAT(#{param.contractStartTime}, '%Y-%m-%d')-->
+<!--            </if>-->
+<!--            <if test="param.contractEntTime != null and param.contractEntTime != ''">-->
+<!--                AND DATE_FORMAT(lbc.contract_ent_time,, '%Y-%m-%d') &lt; DATE_FORMAT(#{param.contractEntTime}, '%Y-%m-%d')-->
+<!--            </if>-->
             <if test="param.brandName != null and param.brandName != ''">
                 AND t.aaa LIKE CONCAT('%', #{param.brandName}, '%')
             </if>
-            <if test="param.stratTimeDate != null and param.stratTimeDate != '' and param.endTimeDate != null and param.endTimeDate != ''">
-                AND lbc.contract_start_time >=  DATE_FORMAT(#{param.stratTimeDate}, '%Y-%m-%d')
-                AND lbc.contract_ent_time &lt;= DATE_FORMAT(#{param.endTimeDate}, '%Y-%m-%d')
+            <if test="param.startDate != null and param.startDate != '' and param.endDate != null and param.endDate != ''">
+                AND lbc.contract_start_time >=  DATE_FORMAT(#{param.startDate}, '%Y-%m-%d')
+                AND lbc.contract_ent_time &lt;= DATE_FORMAT(#{param.endDate}, '%Y-%m-%d')
             </if>
         </where>
         GROUP BY

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

@@ -77,7 +77,6 @@ public class BasicdataStoreContactServiceImpl extends BaseServiceImpl<BasicdataS
 					throw new RuntimeException("商场必须存在一个默认联系人");
 				}
 			}
-
 			List<Long> ids = storeContactEntities.stream().filter(f -> !f.getId().equals(basicdataStoreContact.getId())).map(BasicdataStoreContactEntity::getId).collect(Collectors.toList());
 			if (!ids.isEmpty()) {
 				this.update(Wrappers.<BasicdataStoreContactEntity>update().lambda()
@@ -85,11 +84,13 @@ public class BasicdataStoreContactServiceImpl extends BaseServiceImpl<BasicdataS
 					.set(BasicdataStoreContactEntity::getDefaultType,false)
 				);
 			}
+			List<BasicdataStoreContactEntity> collected = storeContactEntities.stream().filter(f -> f.getId().equals(basicdataStoreContact.getId())).collect(Collectors.toList());
+
 			//修改客户的展示联系人为默认联系人
 			basicdataClientService.update(Wrappers.<BasicdataClientEntity>update().lambda()
-				.eq(BasicdataClientEntity::getId,basicdataStoreContact.getShopId())
-				.set(BasicdataClientEntity::getLinkman,basicdataStoreContact.getLinkman())
-				.set(BasicdataClientEntity::getPhone,basicdataStoreContact.getPhone())
+				.eq(BasicdataClientEntity::getId,collected.get(0).getShopId())
+				.set(BasicdataClientEntity::getLinkman,collected.get(0).getLinkman())
+				.set(BasicdataClientEntity::getPhone,collected.get(0).getPhone())
 			);
 			this.updateById(basicdataStoreContact);
 			return true;

blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/java/com/logpm/factorydata/linsy/enums/FactoryNodeEnums.java

@@ -17,11 +17,11 @@ public enum FactoryNodeEnums {
 	/**
 	 * 已交接
 	 */
-	INITIAL_WAREHOUSE_ENTRY(20, "Deliveried", 1),
+	INITIAL_WAREHOUSE_ENTRY(101020, "Deliveried", 1),
 	/**
 	 * 收货完成
 	 */
-	END_WAREHOUSE_UNLOADING(170, "Received", 1);
+	END_WAREHOUSE_UNLOADING(105040, "Received", 1);
 
 	private Integer code;
 	private String text;

blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/java/com/logpm/factorydata/linsy/enums/NodeNeedEnums.java

@@ -16,11 +16,11 @@ public enum NodeNeedEnums implements Serializable {
 	/**
 	 * 始发仓入库
 	 */
-	INITIAL_WAREHOUSE_ENTRY(20, "始发仓入库"),
+	INITIAL_WAREHOUSE_ENTRY(101020, "始发仓入库"),
 	/**
 	 * 末端仓卸车确认
 	 */
-	END_WAREHOUSE_UNLOADING(170, "末端仓卸车确认"),
+	END_WAREHOUSE_UNLOADING(105040, "末端仓卸车确认"),
 	;
 
 	private Integer code;