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

yd-api/src/main/java/com/yd/api/practitioner/PractitionerController.java

@@ -685,6 +685,15 @@ public class PractitionerController {
         return result;
     }
 
+    @RequestMapping("/updateInformedSheetById")
+    public Object updateInformedSheetById(@RequestBody UpdateInformedSheetByIdRequestVO requestVO) {
+        JsonResult result = new JsonResult();
+        CommonResultIDResponseVO responseVO = practitionerService.updateInformedSheetById(requestVO);
+        result.addResult(responseVO);
+        result.setData(responseVO);
+        return result;
+    }
+
     @RequestMapping("/queryInformedSheetById")
     public Object queryInformedSheetById(@RequestBody IDRequestVO requestVO) {
         JsonResult result = new JsonResult();

yd-api/src/main/java/com/yd/api/practitioner/vo/informed/UpdateInformedSheetByIdRequestVO.java

@@ -5,5 +5,15 @@ import lombok.Data;
 @Data
 public class UpdateInformedSheetByIdRequestVO {
     private Long id;
-    private String imgStr;
+    /**
+     * 保单号
+     */
+    private String policyNo;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    private Long loginId;
 }

yd-api/src/main/java/com/yd/dal/mapper/customer/AgPoInformedMapper.java

@@ -18,4 +18,6 @@ public interface AgPoInformedMapper {
     int updateByPrimaryKey(AgPoInformed record);
 
     List<AgPoInformed> selectByRecord(AgPoInformed record);
+
+    String getNextInformedNo();
 }
\ No newline at end of file

yd-api/src/main/java/com/yd/rmi/cache/SystemConfigService.java

 package com.yd.rmi.cache;
 
-import com.yd.dal.entity.meta.MdCode;
-import com.yd.dal.entity.meta.MdIncometaxRate;
-import com.yd.dal.entity.meta.MdMkCampaign;
-import com.yd.dal.entity.meta.MdPractitionerHiringApproveSteps;
-import com.yd.dal.service.meta.MdCodeDALService;
-import com.yd.dal.service.meta.MdIncometaxRateDALService;
-import com.yd.dal.service.meta.MdMkCampaignDALService;
-import com.yd.dal.service.meta.MdPractitionerHiringApproveStepsDALService;
+import com.yd.dal.entity.meta.*;
+import com.yd.dal.service.meta.*;
 import com.yd.rmi.ali.ossinterf.service.AliOssInterfService;
 import com.yd.util.CommonUtil;
 import net.sf.ehcache.Cache;
@@ -39,6 +33,8 @@ public class SystemConfigService implements CommandLineRunner{
 	private MdMkCampaignDALService mdMkCampaignDALService;
 	@Autowired
 	private MdIncometaxRateDALService mdIncometaxRateDALService;
+	@Autowired
+	private MdDropOptionsDALService mdDropOptionsDALService;
 
 	/**
 	 * 保存cache
@@ -248,7 +244,21 @@ public class SystemConfigService implements CommandLineRunner{
 		return incometaxRates;
 	}
 
-
+	public MdDropOptions getDropOption(String masterCode, String optionCode) {
+		if (CommonUtil.isNullOrBlank(masterCode) || CommonUtil.isNullOrBlank(optionCode)) {
+			return null;
+		}
+		MdDropOptions mdDropOption;
+		Element element = systemConfigCache.get(masterCode + optionCode);
+		if (element != null && element.getObjectValue() != null) {
+			mdDropOption = (MdDropOptions) element.getObjectValue();
+		} else {
+			mdDropOption = mdDropOptionsDALService.selectByMasterCodeAndOptionsCode(masterCode, optionCode);
+			element = new Element(masterCode + optionCode, mdDropOption);
+			systemConfigCache.put(element);
+		}
+		return mdDropOption;
+	}
 
 	@SuppressWarnings("unchecked")
     public List<MdPractitionerHiringApproveSteps> findHiringApproveStepsByPractitionerLevel(String practitionerLevelCode) {

yd-api/src/main/resources/mapper/customer/AclPractitionerMapper.xml

@@ -1403,8 +1403,8 @@
   <select id="ownOpportunityQuery" resultMap="opportunityQuery">
     SELECT
     a.customer_id opportunityId,
-    c.NAME name,
-    c.mobile_no mobileNo,
+    IFNULL(a.customer_name,c.NAME) name,
+    IFNULL(a.customer_mobile,c.mobile_no) mobileNo,
     date_format(a.created_at, '%Y-%m-%d %H:%i:%s') opportunityDate,
     if (p.source_from = 0 ,(SELECT cam.name from ag_md_mk_campaign cam where cam.id = p.mkt_campaign ),(SELECT md.drop_option_name from ag_md_drop_options md where p.source_from = md.id )) opportunityFrom,
     a.id leadsAssignedId ,

yd-api/src/main/resources/mapper/customer/AgPoInformedMapper.xml

@@ -237,8 +237,8 @@
     <if test="customerMobile != null">
       and customer_mobile = #{customerMobile,jdbcType=VARCHAR}
     </if>
-    <if test="updatedAt != null">
-      and practitioner_id = #{updatedAt,jdbcType=BIGINT}
+    <if test="practitionerId != null">
+      and practitioner_id = #{practitionerId,jdbcType=BIGINT}
     </if>
     <if test="policyNo != null">
       and policy_no = #{policyNo,jdbcType=VARCHAR}
@@ -247,4 +247,7 @@
       and sign_date = #{signDate,jdbcType=VARCHAR}
     </if>
   </select>
+  <select id="getNextInformedNo" resultType="java.lang.String" statementType="CALLABLE">
+      select f_getNextInformedNo()
+  </select>
 </mapper>
\ No newline at end of file