feat: 根据药店省市区+地址判断药店是新增还是修改

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmDaPharmacyServiceImpl.java

@@ -76,17 +76,32 @@ public class WmDaPharmacyServiceImpl extends ServiceImpl<WmDaPharmacyMapper, WmD
 		if(null==wmTaskContent){
 			return R.failed("调研信息为空");
 		}
-		//Temp3对应药店名称
-		//有药店名称,获取药店信息
-//		List<WmDaPharmacy> wdplist=wmDaPharmacyMapper.slectByParam(wmTaskContent.getTemp3());
+		// 根据省市区+详情地址查询药店
 		WmDaPharmacy query = new WmDaPharmacy();
-		query.setPharmacyName(wmTaskContent.getTemp3());
+		// 省市区
+		if (!StringUtil.isEmpty(wmTaskContent.getTemp7())) {
+			String[] citys = wmTaskContent.getTemp7().split("-");
+			if (citys.length == 3) {
+				query.setProvince(citys[0]);
+				query.setCity(citys[1]);
+				query.setArea(citys[2]);
+			} else {
+				String[] citys1 = wmTaskContent.getTemp7().split(",");
+				if (citys1.length == 3) {
+					query.setProvince(citys1[0]);
+					query.setCity(citys1[1]);
+					query.setArea(citys1[2]);
+				}
+			}
+		}
+		// 详细地址
+		query.setAddress(wmTaskContent.getTemp4());
 		query.setDelFlag("0");
-		List<WmDaPharmacy> wdplist=wmDaPharmacyMapper.selectList(Wrappers.query(query));
-		if(null!=wdplist&&wdplist.size()>0){
-			wmDaPharmacy=wdplist.get(0);
+		List<WmDaPharmacy> wdplist = wmDaPharmacyMapper.selectList(Wrappers.query(query));
+		if(CollectionUtil.isNotEmpty(wdplist)) {
+			wmDaPharmacy = wdplist.get(0);
 			wmTask.setCompareResult("2");//信息不一致
-		}else {
+		} else {
 			wmTask.setCompareResult("1");//新增
 		}
 		Map<String,Object> result = new HashMap();

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmTaskContentServiceImpl.java

@@ -524,7 +524,7 @@ public class WmTaskContentServiceImpl extends ServiceImpl<WmTaskContentMapper, W
 					return R.failed("任务保存失败");
 				}
 				//保存打卡记录
-				if ("5".equals(wmTaskContent.getTemp30()) || "6".equals(wmTaskContent.getTemp30())) {
+				if ("5".equals(wmTaskContent.getTemp30()) || "6".equals(wmTaskContent.getTemp30()) || "33".equals(wmTaskContent.getTemp30())) {
 					WmUserSign wmUserSign = new WmUserSign();
 					wmUserSign.setSignEntType(wmTaskContent.getTemp29());
 					wmUserSign.setSignEntName(wmTaskContent.getTemp7());