fix: 修复医院、商业公司、药店任务审核bug

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

@@ -36,6 +36,7 @@ import com.qunzhixinxi.hnqz.admin.service.WmScorePackageService;
 import com.qunzhixinxi.hnqz.admin.service.WmScorePackageStatusService;
 import com.qunzhixinxi.hnqz.admin.service.WmTaskService;
 import com.qunzhixinxi.hnqz.common.core.util.R;
+import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
 import lombok.AllArgsConstructor;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
@@ -254,17 +255,17 @@ public class WmDaDistributionServiceImpl extends ServiceImpl<WmDaDistributionMap
 //				}
 //			}
 //		}
-		if(null!=wmTaskContent.getTemp4()&&!wmTaskContent.getTemp4().equals(wmDaDistribution.getSygsdz())){
+		if (StringUtils.isNotBlank(wmTaskContent.getTemp4()) && !wmTaskContent.getTemp4().equals(wmDaDistribution.getSygsdz())){
 			resList.add(generateMap("商业公司地址",wmDaDistribution.getSygsdz(),wmTaskContent.getTemp4()));
 			newinfo.setSygsdz(wmTaskContent.getTemp4());
 		}
 
-		if(null!=wmTaskContent.getTemp3()&&!wmTaskContent.getTemp3().equals(wmDaDistribution.getGsmc())){
+		if (StringUtils.isNotBlank(wmTaskContent.getTemp3()) && !wmTaskContent.getTemp3().equals(wmDaDistribution.getGsmc())){
 			resList.add(generateMap("商业公司名称",wmDaDistribution.getGsmc(),wmTaskContent.getTemp3()));
 			newinfo.setGsmc(wmTaskContent.getTemp3());
 		}
 
-		if(null!=wmTaskContent.getTemp5()){
+		if (StringUtils.isNotBlank(wmTaskContent.getTemp5())) {
 			//小程序端存的不一定value或label,web存的label，需要匹配
 			Map<String,String> map=wmDaHospitalService.compareDictItem("公司规模",wmDaDistribution.getGsgm(),wmTaskContent.getTemp5(),"bus_gsgm");
 			if(null!=map&&!map.isEmpty()){
@@ -277,23 +278,23 @@ public class WmDaDistributionServiceImpl extends ServiceImpl<WmDaDistributionMap
 //			resList.add(generateMap("公司规模",wmDaDistribution.getGsgm(),wmTaskContent.getTemp5()));
 //			newinfo.setGsgm(wmTaskContent.getTemp5());
 //		}
-		if(null!=wmTaskContent.getTemp6()&&!wmTaskContent.getTemp6().equals(wmDaDistribution.getShyshxydm())){
+		if (StringUtils.isNotBlank(wmTaskContent.getTemp6()) && !wmTaskContent.getTemp6().equals(wmDaDistribution.getShyshxydm())){
 			resList.add(generateMap("统一社会信用代码", wmDaDistribution.getShyshxydm(), wmTaskContent.getTemp6()));
 			newinfo.setShyshxydm(wmTaskContent.getTemp6());
 		}
-		if(null!=wmTaskContent.getTemp7()&&!wmTaskContent.getTemp7().equals(wmDaDistribution.getGszcd())){
+		if (StringUtils.isNotBlank(wmTaskContent.getTemp7()) && !wmTaskContent.getTemp7().equals(wmDaDistribution.getGszcd())){
 			resList.add(generateMap("公司注册地",wmDaDistribution.getGszcd(),wmTaskContent.getTemp7()));
 			newinfo.setGszcd(wmTaskContent.getTemp7());
 		}
-		if(null!=wmTaskContent.getTemp8()&&!wmTaskContent.getTemp8().equals(wmDaDistribution.getZczb())){
+		if (StringUtils.isNotBlank(wmTaskContent.getTemp8()) && !wmTaskContent.getTemp8().equals(wmDaDistribution.getZczb())){
 			resList.add(generateMap("注册资本",wmDaDistribution.getZczb(),wmTaskContent.getTemp8()));
 			newinfo.setZczb(wmTaskContent.getTemp8());
 		}
-		if(null!=wmTaskContent.getTemp9()&&!wmTaskContent.getTemp9().equals(wmDaDistribution.getGspzsbh())){
+		if (StringUtils.isNotBlank(wmTaskContent.getTemp9()) && !wmTaskContent.getTemp9().equals(wmDaDistribution.getGspzsbh())){
 			resList.add(generateMap("GSP证书编号",wmDaDistribution.getGspzsbh(),wmTaskContent.getTemp9()));
 			newinfo.setGspzsbh(wmTaskContent.getTemp9());
 		}
-		if(null!=wmTaskContent.getTemp10()&&!wmTaskContent.getTemp10().equals(wmDaDistribution.getFrdb())){
+		if (StringUtils.isNotBlank(wmTaskContent.getTemp10()) && !wmTaskContent.getTemp10().equals(wmDaDistribution.getFrdb())){
 			resList.add(generateMap("法人代表",wmDaDistribution.getFrdb(),wmTaskContent.getTemp10()));
 			newinfo.setFrdb(wmTaskContent.getTemp10());
 		}
@@ -335,20 +336,20 @@ public class WmDaDistributionServiceImpl extends ServiceImpl<WmDaDistributionMap
 //			newinfo.setXsbmdjrlxfs(wmTaskContent.getTemp19());
 //		}
 
-		if(null!=wmTaskContent.getTemp20()&&!wmTaskContent.getTemp20().equals(wmDaDistribution.getGsjj())){
+		if (StringUtils.isNotBlank(wmTaskContent.getTemp20()) && !wmTaskContent.getTemp20().equals(wmDaDistribution.getGsjj())){
 			resList.add(generateMap("公司简介",wmDaDistribution.getGsjj(),wmTaskContent.getTemp20()));
 			newinfo.setGsjj(wmTaskContent.getTemp20());
 		}
-		if(null!=wmTaskContent.getTemp21()&&!wmTaskContent.getTemp21().equals(wmDaDistribution.getJyys())){
+		if (StringUtils.isNotBlank(wmTaskContent.getTemp21()) && !wmTaskContent.getTemp21().equals(wmDaDistribution.getJyys())){
 			resList.add(generateMap("经营优势",wmDaDistribution.getJyys(),wmTaskContent.getTemp21()));
 			newinfo.setJyys(wmTaskContent.getTemp21());
 		}
-		if (null != wmTaskContent.getTemp22() && !wmTaskContent.getTemp22().equals(wmDaDistribution.getMedicineTraceability())) {
+		if (StringUtils.isNotBlank(wmTaskContent.getTemp22()) && !wmTaskContent.getTemp22().equals(wmDaDistribution.getMedicineTraceability())) {
 			resList.add(generateMap("药品信息化追溯体系", WmDaDistribution.resolve(wmDaDistribution.getMedicineTraceability()).getName(),
 					WmDaDistribution.resolve(wmTaskContent.getTemp22()).getName()));
 			newinfo.setMedicineTraceability(wmTaskContent.getTemp22());
 		}
-		if (null != wmTaskContent.getTemp25() && !wmTaskContent.getTemp25().equals(wmDaDistribution.getMedicineTraceabilityOther())) {
+		if (StringUtils.isNotBlank( wmTaskContent.getTemp25()) && !wmTaskContent.getTemp25().equals(wmDaDistribution.getMedicineTraceabilityOther())) {
 			resList.add(generateMap("追溯体系介绍", wmDaDistribution.getMedicineTraceabilityOther(), wmTaskContent.getTemp25()));
 			newinfo.setMedicineTraceabilityOther(wmTaskContent.getTemp25());
 		}
@@ -405,11 +406,16 @@ public class WmDaDistributionServiceImpl extends ServiceImpl<WmDaDistributionMap
 //			updateWrapper.set(WmTask::getRealFlag,"0");//0通过
 			updateTask.setRealFlag("0");
 			//更新审核信息
+			LocalDateTime now = LocalDateTime.now();
+			Integer userId = SecurityUtils.getUser().getId();
 			if("1".equals(compareResult)){//新增
 				//新增
-				wmDaDistribution.setCreateTime(LocalDateTime.now());
+				wmDaDistribution.setCreateTime(now);
+				wmDaDistribution.setCreateUser(userId);
 				this.save(wmDaDistribution);
 			}else if("2".equals(compareResult)){//信息不一致
+				wmDaDistribution.setUpdateTime(now);
+				wmDaDistribution.setUpdateUser(userId);
 				this.updateById(wmDaDistribution);
 			}else if("3".equals(compareResult)){//信息一致
 				//信息一致的情况下，只改地址
@@ -419,6 +425,8 @@ public class WmDaDistributionServiceImpl extends ServiceImpl<WmDaDistributionMap
 					wmDaDistribution1.setAddress(map.get("address"));
 					wmDaDistribution1.setLongitude(map.get("longitude"));
 					wmDaDistribution1.setLatitude(map.get("latitude"));
+					wmDaDistribution1.setUpdateTime(now);
+					wmDaDistribution1.setUpdateUser(userId);
 					this.updateById(wmDaDistribution1);
 				}
 			}

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

@@ -35,6 +35,7 @@ import com.qunzhixinxi.hnqz.admin.service.WmScorePackageService;
 import com.qunzhixinxi.hnqz.admin.service.WmScorePackageStatusService;
 import com.qunzhixinxi.hnqz.admin.service.WmTaskService;
 import com.qunzhixinxi.hnqz.common.core.util.R;
+import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
 import lombok.AllArgsConstructor;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
@@ -252,11 +253,10 @@ public class WmDaHospitalServiceImpl extends ServiceImpl<WmDaHospitalMapper, WmD
 												 WmDaHospital newinfo) {
 		List<Map<String, String>> resList = new ArrayList<>();
 		String address = wmDaHospital.getProvince() + "-" + wmDaHospital.getCity() + "-" + wmDaHospital.getArea();
-		if (null == wmDaHospital.getProvince()) {
+		if (StringUtils.isBlank(wmDaHospital.getProvince())) {
 			address = null;
-
 		}
-		if (null != wmTaskContent.getTemp4() && !wmTaskContent.getTemp4().equals(address)) {
+		if (StringUtils.isNotBlank(wmTaskContent.getTemp4()) && !wmTaskContent.getTemp4().equals(address)) {
 			resList.add(generateMap("所在城市", address, wmTaskContent.getTemp4()));
 			String[] citys = wmTaskContent.getTemp4().split("-");
 			if (citys.length == 3) {
@@ -272,12 +272,12 @@ public class WmDaHospitalServiceImpl extends ServiceImpl<WmDaHospitalMapper, WmD
 				}
 			}
 		}
-		if (null != wmTaskContent.getTemp3() && !wmTaskContent.getTemp3().equals(wmDaHospital.getYymc())) {
+		if (StringUtils.isNotBlank(wmTaskContent.getTemp3()) && !wmTaskContent.getTemp3().equals(wmDaHospital.getYymc())) {
 			resList.add(generateMap("医院名称", wmDaHospital.getYymc(), wmTaskContent.getTemp3()));
 			newinfo.setYymc(wmTaskContent.getTemp3());
 		}
 
-		if (null != wmTaskContent.getTemp5()) {
+		if (StringUtils.isNotBlank(wmTaskContent.getTemp5())) {
 			//小程序端存的不一定value或label,web存的label，需要匹配
 			Map<String, String> map = compareDictItem("医院规模", wmDaHospital.getYygm(), wmTaskContent.getTemp5(), "hospital_level");
 			if (null != map && !map.isEmpty()) {
@@ -285,7 +285,7 @@ public class WmDaHospitalServiceImpl extends ServiceImpl<WmDaHospitalMapper, WmD
 				newinfo.setYygm(map.get("newData"));
 			}
 		}
-		if (null != wmTaskContent.getTemp6()) {
+		if (StringUtils.isNotBlank(wmTaskContent.getTemp6())) {
 			//小程序端存的value,web存的label，需要匹配
 			Map<String, String> map = compareDictItem("医院性质", wmDaHospital.getYyxz(), wmTaskContent.getTemp6(), "hospital_xz");
 			if (null != map && !map.isEmpty()) {
@@ -294,7 +294,7 @@ public class WmDaHospitalServiceImpl extends ServiceImpl<WmDaHospitalMapper, WmD
 			}
 		}
 
-		if (null != wmTaskContent.getTemp22()) {
+		if (StringUtils.isNotBlank(wmTaskContent.getTemp22())) {
 			//小程序端存的value,web存的label，需要匹配
 			Map<String, String> map = compareDictItem("院病床总数（张）", wmDaHospital.getYbczs(), wmTaskContent.getTemp22(), "hospital_cw");
 			if (null != map && !map.isEmpty()) {
@@ -303,7 +303,7 @@ public class WmDaHospitalServiceImpl extends ServiceImpl<WmDaHospitalMapper, WmD
 			}
 		}
 
-		if (null != wmTaskContent.getTemp8() && !wmTaskContent.getTemp8().equals(wmDaHospital.getWebsite())) {
+		if (StringUtils.isNotBlank(wmTaskContent.getTemp8()) && !wmTaskContent.getTemp8().equals(wmDaHospital.getWebsite())) {
 			resList.add(generateMap("医院官网", wmDaHospital.getWebsite(), wmTaskContent.getTemp8()));
 			newinfo.setWebsite(wmTaskContent.getTemp8());
 		}
@@ -457,11 +457,16 @@ public class WmDaHospitalServiceImpl extends ServiceImpl<WmDaHospitalMapper, WmD
 			updateTask.setRealFlag("0");
 
 			//更新审核信息
+			LocalDateTime now = LocalDateTime.now();
+			Integer userId = SecurityUtils.getUser().getId();
 			if ("1".equals(compareResult)) {//新增
 				//新增
-				wmDaHospital.setCreateTime(LocalDateTime.now());
+				wmDaHospital.setCreateTime(now);
+				wmDaHospital.setCreateUser(userId);
 				this.save(wmDaHospital);
 			} else if ("2".equals(compareResult)) {//信息不一致
+				wmDaHospital.setUpdateTime(now);
+				wmDaHospital.setUpdateUser(userId);
 				this.updateById(wmDaHospital);
 			} else if ("3".equals(compareResult)) {//信息一致
 				//信息一致的情况下，只改地址
@@ -471,6 +476,8 @@ public class WmDaHospitalServiceImpl extends ServiceImpl<WmDaHospitalMapper, WmD
 					wmDaHospital1.setAddress(map.get("address"));
 					wmDaHospital1.setLongitude(map.get("longitude"));
 					wmDaHospital1.setLatitude(map.get("latitude"));
+					wmDaHospital1.setUpdateTime(now);
+					wmDaHospital1.setUpdateUser(userId);
 					this.updateById(wmDaHospital1);
 				}
 			}
@@ -531,20 +538,20 @@ public class WmDaHospitalServiceImpl extends ServiceImpl<WmDaHospitalMapper, WmD
 
 	public WmDaHospital generateHospital(Map<String, String> map) {
 		WmDaHospital wmDaHospital = new WmDaHospital();
-		wmDaHospital.setId(StringUtil.isEmpty(map.get("id")) ? null : map.get("id"));
-		wmDaHospital.setYymc(StringUtil.isEmpty(map.get("yymc")) ? null : map.get("yymc"));
+		wmDaHospital.setId(StringUtil.isBlank(map.get("id")) ? null : map.get("id"));
+		wmDaHospital.setYymc(StringUtil.isBlank(map.get("yymc")) ? null : map.get("yymc"));
 
-		wmDaHospital.setProvince(StringUtil.isEmpty(map.get("province")) ? null : map.get("province"));
-		wmDaHospital.setCity(StringUtil.isEmpty(map.get("city")) ? null : map.get("city"));
-		wmDaHospital.setArea(StringUtil.isEmpty(map.get("area")) ? null : map.get("area"));
-		wmDaHospital.setAddress(StringUtil.isEmpty(map.get("address")) ? null : map.get("address"));
+		wmDaHospital.setProvince(StringUtil.isBlank(map.get("province")) ? null : map.get("province"));
+		wmDaHospital.setCity(StringUtil.isBlank(map.get("city")) ? null : map.get("city"));
+		wmDaHospital.setArea(StringUtil.isBlank(map.get("area")) ? null : map.get("area"));
+		wmDaHospital.setAddress(StringUtil.isBlank(map.get("address")) ? null : map.get("address"));
 
 
-		wmDaHospital.setYygm(StringUtil.isEmpty(map.get("yygm")) ? null : map.get("yygm"));//医院规模
-		wmDaHospital.setYyxz(StringUtil.isEmpty(map.get("yyxz")) ? null : map.get("yyxz"));//医院性质
+		wmDaHospital.setYygm(StringUtil.isBlank(map.get("yygm")) ? null : map.get("yygm"));//医院规模
+		wmDaHospital.setYyxz(StringUtil.isBlank(map.get("yyxz")) ? null : map.get("yyxz"));//医院性质
 
-		wmDaHospital.setWebsite(StringUtil.isEmpty(map.get("website")) ? null : map.get("website"));//医院官网
-		wmDaHospital.setYbczs(StringUtil.isEmpty(map.get("ybczs")) ? null : map.get("ybczs"));//院病床总数（张）
+		wmDaHospital.setWebsite(StringUtil.isBlank(map.get("website")) ? null : map.get("website"));//医院官网
+		wmDaHospital.setYbczs(StringUtil.isBlank(map.get("ybczs")) ? null : map.get("ybczs"));//院病床总数（张）
 
 
 //		wmDaHospital.setLxzj(StringUtil.isEmpty(map.get("lxzj"))?null:map.get("lxzj"));//联系总机
@@ -560,8 +567,8 @@ public class WmDaHospitalServiceImpl extends ServiceImpl<WmDaHospitalMapper, WmD
 //		wmDaHospital.setYbczs(StringUtil.isEmpty(map.get("ybczs"))?null:Integer.parseInt(map.get("ybczs")));//院病床总数（张）
 //		wmDaHospital.setZlghsy(StringUtil.isEmpty(map.get("zlghsy"))?null:map.get("zlghsy"));//主流供货商业
 
-		wmDaHospital.setLongitude(StringUtil.isEmpty(map.get("longitude")) ? null : map.get("longitude"));//经度
-		wmDaHospital.setLatitude(StringUtil.isEmpty(map.get("latitude")) ? null : map.get("latitude"));//经度
+		wmDaHospital.setLongitude(StringUtil.isBlank(map.get("longitude")) ? null : map.get("longitude"));//经度
+		wmDaHospital.setLatitude(StringUtil.isBlank(map.get("latitude")) ? null : map.get("latitude"));//经度
 
 		return wmDaHospital;
 	}

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

@@ -31,6 +31,7 @@ import com.qunzhixinxi.hnqz.admin.service.WmScorePackageService;
 import com.qunzhixinxi.hnqz.admin.service.WmScorePackageStatusService;
 import com.qunzhixinxi.hnqz.admin.service.WmTaskService;
 import com.qunzhixinxi.hnqz.common.core.util.R;
+import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -130,6 +131,8 @@ public class WmDaPharmacyServiceImpl extends ServiceImpl<WmDaPharmacyMapper, WmD
 			WmDaPharmacy wmDaPharmacy = new WmDaPharmacy();
 			WmTaskContent wmTaskContent = wmTaskContentMapper.selectById(wmTask.getTaskContentId());
 			//更新审核信息
+			LocalDateTime now = LocalDateTime.now();
+			Integer userId = SecurityUtils.getUser().getId();
 			if("1".equals(compareResult)){//新增
 				//新增
 				wmDaPharmacy.setPharmacyName(wmTaskContent.getTemp3());//名称
@@ -149,7 +152,8 @@ public class WmDaPharmacyServiceImpl extends ServiceImpl<WmDaPharmacyMapper, WmD
 						}
 					}
 				}
-				wmDaPharmacy.setCreateTime(LocalDateTime.now());
+				wmDaPharmacy.setCreateTime(now);
+				wmDaPharmacy.setCreateUser(userId);
 				this.save(wmDaPharmacy);
 			}else if("2".equals(compareResult)){//信息不一致
 				//对比药店和调研信息,只有所属地区不一样
@@ -176,6 +180,8 @@ public class WmDaPharmacyServiceImpl extends ServiceImpl<WmDaPharmacyMapper, WmD
 				wmDaPharmacy.setId(map.get("infoId"));
 				wmDaPharmacy.setPharmacyName(wmTaskContent.getTemp3());//名称
 				wmDaPharmacy.setAddress(wmTaskContent.getTemp4());
+				wmDaPharmacy.setUpdateTime(now);
+				wmDaPharmacy.setUpdateUser(userId);
 				//更新药店信息;
 				this.updateById(wmDaPharmacy);
 			}