Merge branch 'master' of http://47.108.172.52:3000/dayou/item-management-1phase

service/src/main/java/com/dayou/service/impl/PersonalProductionServiceImpl.java

@@ -165,7 +165,9 @@ public class PersonalProductionServiceImpl extends ServiceImpl<PersonalProductio
         textMap.put("validateCode",target.getValidateCode());
 
         PersonalCalculate calculate = personalCalculateMapper.getByTargetId(target.getId());
-        textMap.put("rightsType",calculate.getRightsType());
+        if (calculate!=null){
+            textMap.put("rightsType",calculate.getRightsType());
+        }
         if (tag == 1 || tag == 4){
             NameUrlDTO statementPath = genStatement(orderId,target,textMap,certificateEnum,tag);
             return createPro(target.getId(),statementPath,tag,true);
@@ -500,7 +502,7 @@ public class PersonalProductionServiceImpl extends ServiceImpl<PersonalProductio
             PersonalProduction pp = this.getOne(new LambdaQueryWrapper<PersonalProduction>().eq(PersonalProduction::getProduction, type)
                     .eq(PersonalProduction::getTargetId, targetId).eq(BaseEntity::getDeleted, Boolean.FALSE));
             if (pp==null){
-                createPro(targetId,null,4,false);
+                createPro(targetId,null,5,false);
             }
             return this.update(new LambdaUpdateWrapper<PersonalProduction>().eq(PersonalProduction::getProduction,type)
                     .eq(PersonalProduction::getTargetId,targetId).set(PersonalProduction::getCheckState, ReportStatus.已审核));
@@ -644,6 +646,9 @@ public class PersonalProductionServiceImpl extends ServiceImpl<PersonalProductio
         else if (tag ==3){
             productionType = ProductionEnum.FINAL.name();
             productionTypeName = ProductionEnum.FINAL.getMsg();
+        }else if (tag ==5){
+            productionType = ProductionEnum.LETTER.name();
+            productionTypeName = ProductionEnum.LETTER.getMsg();
         }
         else {
             return Boolean.FALSE;
@@ -1363,7 +1368,7 @@ public class PersonalProductionServiceImpl extends ServiceImpl<PersonalProductio
     private void landRight(Map<String, Object> textMap,CertificateEnum certificateEnum){
         // 土地权益:判断是否提供了国土证，如果没有提供国土证。则需要判断是否是划拨
         if (!certificateEnum.equals(LAND_CERTIFICATE)) {
-            String landRight = (textMap.get("rightsType")).equals("ALLOT") ? "估价对象所占用的土地为划拨，本次评估设定估价对象占用的土地使用权系划拨用地" : "估价对象所在楼房为商品房，本次评估设定估价对象占用的土地使用权系出让用地";
+            String landRight = ("ALLOT").equals(textMap.get("rightsType")) ? "估价对象所占用的土地为划拨，本次评估设定估价对象占用的土地使用权系划拨用地" : "估价对象所在楼房为商品房，本次评估设定估价对象占用的土地使用权系出让用地";
             textMap.put("landRight", landRight);
         }
     }