Merge remote-tracking branch 'origin/dev_ic_mp' into develop

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/FinishStaffFromDTO.java

@@ -2,7 +2,6 @@ package com.epmet.dto.form.demand;
 
 import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
-import org.hibernate.validator.constraints.Length;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotBlank;
@@ -35,13 +34,13 @@ public class FinishStaffFromDTO implements Serializable {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date serviceEndTime;
 
-    @NotBlank(message = "完成结果不能为空", groups = IcShowGroup.class)
+    // @NotBlank(message = "完成结果不能为空", groups = IcShowGroup.class)
     private String finishResult;
 
-    @Length(max = 1000,message = "最多输入1000字",groups = {IcShowGroup.class})
+    // @Length(max = 1000,message = "最多输入1000字",groups = {IcShowGroup.class})
     private String finishDesc;
 
-    @NotNull(message = "得分不能为空", groups = IcShowGroup.class)
+    // @NotNull(message = "得分不能为空", groups = IcShowGroup.class)
     private BigDecimal score;
 
 

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/OptionDTO.java

@@ -9,4 +9,5 @@ public class OptionDTO implements Serializable {
     private static final long serialVersionUID = -6722370308097497466L;
     private String label;
     private String value;
+    private Integer awardPoint;
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/UserDemandConstant.java

@@ -82,4 +82,5 @@ public interface UserDemandConstant {
     String DEFAULT_EVALUATE_REMARK="此用户没有填写内容，由系统默认评分";
     // 完成结果：已解决 resolved，未解决 unresolved
     String RESOLVED="resolved";
+    String UN_RESOLVED="unresolved";
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java

@@ -436,23 +436,26 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         }
         // 2、pc完成情况：完成+评价
         if(UserDemandConstant.FINISH_AND_EVALUATE.equals(formDTO.getType())){
-            //2.1、插入评价得分记录
-            IcUserDemandSatisfactionEntity satisfactionEntity=ConvertUtils.sourceToTarget(formDTO,IcUserDemandSatisfactionEntity.class);
-            satisfactionEntity.setEvaluateTime(nowDate);
-            satisfactionEntity.setRemark(StringUtils.isNotBlank(formDTO.getFinishDesc())?formDTO.getFinishDesc():StrConstant.EPMETY_STR);
-            demandSatisfactionDao.insert(satisfactionEntity);
-
-            // 2.2插入评价操作日志
-            IcUserDemandOperateLogEntity evaluateEntity = ConvertUtils.sourceToTarget(formDTO,IcUserDemandOperateLogEntity.class);
-            evaluateEntity.setActionCode(UserDemandConstant.EVALUATE);
-            evaluateEntity.setOperateTime(nowDate);
-            evaluateEntity.setId(null);
-            operateLogDao.insert(evaluateEntity);
-
-            //2.3更新主表已评价标识，是否解决标识。
-            entity.setEvaluateFlag(true);
-            entity.setFinishResult(formDTO.getFinishResult());
 
+            if(StringUtils.isNotBlank(formDTO.getFinishResult())){
+                // 评价
+                //2.1、插入评价得分记录
+                IcUserDemandSatisfactionEntity satisfactionEntity=ConvertUtils.sourceToTarget(formDTO,IcUserDemandSatisfactionEntity.class);
+                satisfactionEntity.setEvaluateTime(nowDate);
+                satisfactionEntity.setRemark(StringUtils.isNotBlank(formDTO.getFinishDesc())?formDTO.getFinishDesc():StrConstant.EPMETY_STR);
+                demandSatisfactionDao.insert(satisfactionEntity);
+
+                // 2.2插入评价操作日志
+                IcUserDemandOperateLogEntity evaluateEntity = ConvertUtils.sourceToTarget(formDTO,IcUserDemandOperateLogEntity.class);
+                evaluateEntity.setActionCode(UserDemandConstant.EVALUATE);
+                evaluateEntity.setOperateTime(nowDate);
+                evaluateEntity.setId(null);
+                operateLogDao.insert(evaluateEntity);
+
+                //2.3更新主表已评价标识，是否解决标识。
+                entity.setEvaluateFlag(true);
+                entity.setFinishResult(formDTO.getFinishResult());
+            }
             //2.4如果需求是志愿者完成的，发送消息：您收到来自XXX的评价，请查看。
             sendVolunnterEvaluated(entity);
 
@@ -466,7 +469,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
             }
             String content = entity.getContent().length() > 100 ? entity.getContent().substring(0, 99) : entity.getContent();
             finishResultDTO.setRemark(String.format(UserDemandConstant.GRANT_POINT_REMARK,entity.getDemandUserName(),content));
-            finishResultDTO.setFinishResult(formDTO.getFinishResult());
+            finishResultDTO.setFinishResult(StringUtils.isNotBlank(formDTO.getFinishResult())?formDTO.getFinishResult():UserDemandConstant.UN_RESOLVED);
         }
         baseDao.updateById(entity);
 

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java

@@ -152,7 +152,17 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
                 throw new RenException(EpmetErrorCode.MOBILE_CODE_ERROR.getCode());
             }
         }
-        // 2、检查是否是志愿者
+        //2、志愿者认证，更新用户基础信息user_base_info+自动注册居民
+        VolunteerRegResiFormDTO param = ConvertUtils.sourceToTarget(formDTO, VolunteerRegResiFormDTO.class);
+        Result regResi = epmetUserOpenFeignClient.volunteerAutoRegResi(param);
+        if (!regResi.success()) {
+            logger.warn(String.format("userId:%s,认证志愿者时，自动注册居民失败，返参:%s", formDTO.getUserId(), JSON.toJSONString(regResi)));
+            if (regResi.getCode() > 8000) {
+                throw new RenException(regResi.getCode(), regResi.getMsg());
+            }
+            throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), regResi.getMsg());
+        }
+        // 3、检查是否是志愿者
         VolunteerInfoDTO originVolunteer = baseDao.selectVolunteerInfoByUserId(formDTO.getUserId());
         if (null != originVolunteer) {
             //能修改的只有这两个属性，像是网格id,网格名称，pid,pids不允许修改，第一次注册成功后不可修改
@@ -183,13 +193,6 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
             // 2.3发送消息 由积分系统消费消息（需要使用规则）
             this.grantActPoints(formDTO);
         }
-        //3、志愿者认证，更新用户基础信息user_base_info+自动注册居民
-        VolunteerRegResiFormDTO param = ConvertUtils.sourceToTarget(formDTO, VolunteerRegResiFormDTO.class);
-        Result regResi=epmetUserOpenFeignClient.volunteerAutoRegResi(param);
-        if(!regResi.success()){
-            logger.warn(String.format("userId:%s,认证志愿者时，自动注册居民失败，返参:%s",formDTO.getUserId(), JSON.toJSONString(regResi)));
-            throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), regResi.getMsg());
-        }
     }
 
     private void grantActPoints(ResiVolunteerAuthenticateFormDTO formDTO){

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcResiDemandDictDao.xml

@@ -91,7 +91,8 @@
     <select id="selectByPCode" parameterType="map" resultType="com.epmet.dto.result.demand.OptionDTO">
         SELECT
             m.CATEGORY_NAME  as label,
-            m.CATEGORY_CODE  as `value`
+            m.CATEGORY_CODE  as `value`,
+            m.AWARD_POINT as awardPoint
         FROM
             ic_resi_demand_dict m
         WHERE

epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml

@@ -106,6 +106,7 @@
         uri.DEL_FLAG = '0'
         AND uri.REG_MOBILE = #{regMobile,jdbcType=VARCHAR}
         AND uc.CUSTOMER_ID = #{customerId,jdbcType=VARCHAR}
+        AND uri.CUSTOMER_ID = #{customerId,jdbcType=VARCHAR}
         AND uc.IS_REGISTER = 1
     </select>