bug

pro-base/src/main/java/com/idea/buildManage/model/ParkInfo.java

@@ -42,7 +42,7 @@ public class ParkInfo implements Serializable {
 
     private Double volumeRatio;
 
-    private Double greenRatio;
+    private String greenRatio;
 
     private BigDecimal price;
 

pro-base/src/main/java/com/idea/buildManage/model/ParkInfoExample.java

@@ -1256,52 +1256,62 @@ public class ParkInfoExample {
             return (Criteria) this;
         }
 
-        public Criteria andGreenRatioEqualTo(Double value) {
+        public Criteria andGreenRatioEqualTo(String value) {
             addCriterion("green_ratio =", value, "greenRatio");
             return (Criteria) this;
         }
 
-        public Criteria andGreenRatioNotEqualTo(Double value) {
+        public Criteria andGreenRatioNotEqualTo(String value) {
             addCriterion("green_ratio <>", value, "greenRatio");
             return (Criteria) this;
         }
 
-        public Criteria andGreenRatioGreaterThan(Double value) {
+        public Criteria andGreenRatioGreaterThan(String value) {
             addCriterion("green_ratio >", value, "greenRatio");
             return (Criteria) this;
         }
 
-        public Criteria andGreenRatioGreaterThanOrEqualTo(Double value) {
+        public Criteria andGreenRatioGreaterThanOrEqualTo(String value) {
             addCriterion("green_ratio >=", value, "greenRatio");
             return (Criteria) this;
         }
 
-        public Criteria andGreenRatioLessThan(Double value) {
+        public Criteria andGreenRatioLessThan(String value) {
             addCriterion("green_ratio <", value, "greenRatio");
             return (Criteria) this;
         }
 
-        public Criteria andGreenRatioLessThanOrEqualTo(Double value) {
+        public Criteria andGreenRatioLessThanOrEqualTo(String value) {
             addCriterion("green_ratio <=", value, "greenRatio");
             return (Criteria) this;
         }
 
-        public Criteria andGreenRatioIn(List<Double> values) {
+        public Criteria andGreenRatioLike(String value) {
+            addCriterion("green_ratio like", value, "greenRatio");
+            return (Criteria) this;
+        }
+
+        public Criteria andGreenRatioNotLike(String value) {
+            addCriterion("green_ratio not like", value, "greenRatio");
+            return (Criteria) this;
+        }
+
+        public Criteria andGreenRatioIn(List<String> values) {
             addCriterion("green_ratio in", values, "greenRatio");
             return (Criteria) this;
         }
 
-        public Criteria andGreenRatioNotIn(List<Double> values) {
+        public Criteria andGreenRatioNotIn(List<String> values) {
             addCriterion("green_ratio not in", values, "greenRatio");
             return (Criteria) this;
         }
 
-        public Criteria andGreenRatioBetween(Double value1, Double value2) {
+        public Criteria andGreenRatioBetween(String value1, String value2) {
             addCriterion("green_ratio between", value1, value2, "greenRatio");
             return (Criteria) this;
         }
 
-        public Criteria andGreenRatioNotBetween(Double value1, Double value2) {
+        public Criteria andGreenRatioNotBetween(String value1, String value2) {
             addCriterion("green_ratio not between", value1, value2, "greenRatio");
             return (Criteria) this;
         }

pro-base/src/main/java/com/idea/customerManagement/service/CustomerManagementService.java

@@ -10,8 +10,10 @@ import com.github.pagehelper.PageInfo;
 import com.idea.buildManage.excel.MnpBuildingExcel;
 import com.idea.buildManage.excel.ParkRoomExcel;
 import com.idea.buildManage.excel.WriteHandlerStrategy;
+import com.idea.buildManage.mapper.ParkFloorDiscMapper;
 import com.idea.buildManage.mapper.ParkInfoMapper;
 import com.idea.buildManage.mapper.ParkRoomMapper;
+import com.idea.buildManage.model.ParkFloorDisc;
 import com.idea.buildManage.model.ParkInfo;
 import com.idea.buildManage.model.ParkRoom;
 import com.idea.buildManage.response.ParkRoomResponse;
@@ -76,6 +78,8 @@ public class CustomerManagementService implements BaseService<CustomerManagement
     private ParkInfoService parkInfoService;
     @Autowired
     private IntentionalDepositService intentionalDepositService;
+    @Autowired
+    private ParkFloorDiscMapper parkFloorDiscMapper;
 
     @Override
     public int deleteByPrimaryKey(String s) {
@@ -392,6 +396,11 @@ public class CustomerManagementService implements BaseService<CustomerManagement
         long count = roomSelectionInfoMapper.countByExample(roomSelectionInfoExample);
         result.setRoomSelectionCount((int) count);
 
+        ParkInfo parkInfo = parkInfoMapper.selectByPrimaryKey(customerManagement.getGroupId());
+        ParkFloorDisc parkFloorDisc = parkFloorDiscMapper.selectByPrimaryKey(customerManagement.getDiscId());
+        result.setGroupDiscName(parkInfo.getGroupName() + parkFloorDisc.getName());
+
+
         return result;
     }
 

pro-base/src/main/java/com/idea/oa/apply/controller/ApplyPaymentSettleController.java

@@ -195,7 +195,7 @@ public class ApplyPaymentSettleController extends BaseController {
                         HandleTypeEnum typeEnum = HandleTypeEnum.FK;
                         Integer srcUserType = 0;//来源用户类型 0管理,1企业
                         String srcUserId = ShiroUtils.getUserId();
-                        String srcUserName = ShiroUtils.getLoginName();
+                        String srcUserName = ShiroUtils.getUser().getTruename();
                         String receiveUserId = push.getPushUser();
                         String routeParam = "id=" + flowId + "&flowMainPushId=" + flowMainPush.getId() + "&applyUser=" + flowMain.getApplyUser();
                         parkWaitHandleService.addHandle(title, typeEnum, srcUserType, srcUserId, srcUserName, receiveUserId, routeParam);
@@ -354,7 +354,7 @@ public class ApplyPaymentSettleController extends BaseController {
                     HandleTypeEnum typeEnum = HandleTypeEnum.FK;
                     Integer srcUserType = 0;//来源用户类型 0管理,1企业
                     String srcUserId = ShiroUtils.getUserId();
-                    String srcUserName = ShiroUtils.getLoginName();
+                    String srcUserName = ShiroUtils.getUser().getTruename();
                     String receiveUserId = flowMainPush.getPushUser();
                     String routeParam = "id=" + flowId + "&flowMainPushId=" + flowMainPush.getId() + "&applyUser=" + flowMain.getApplyUser();
                     ;

pro-base/src/main/resources/mybatis/buildManage/ParkInfoMapper.xml

@@ -19,7 +19,7 @@
     <result column="land_certificate_number" jdbcType="VARCHAR" property="landCertificateNumber" />
     <result column="land_use_permit_number" jdbcType="VARCHAR" property="landUsePermitNumber" />
     <result column="volume_ratio" jdbcType="DOUBLE" property="volumeRatio" />
-    <result column="green_ratio" jdbcType="DOUBLE" property="greenRatio" />
+    <result column="green_ratio" jdbcType="VARCHAR" property="greenRatio" />
     <result column="price" jdbcType="DECIMAL" property="price" />
     <result column="exceeded_price" jdbcType="DECIMAL" property="exceededPrice" />
     <result column="area_status" jdbcType="INTEGER" property="areaStatus" />
@@ -165,7 +165,7 @@
             #{buildArea,jdbcType=DOUBLE}, #{landArea,jdbcType=DOUBLE}, #{projectApprovalDocument,jdbcType=VARCHAR},
             #{engineeringPlanningPermit,jdbcType=VARCHAR}, #{constructionPermit,jdbcType=VARCHAR},
             #{landCertificateNumber,jdbcType=VARCHAR}, #{landUsePermitNumber,jdbcType=VARCHAR},
-            #{volumeRatio,jdbcType=DOUBLE}, #{greenRatio,jdbcType=DOUBLE}, #{price,jdbcType=DECIMAL},
+            #{volumeRatio,jdbcType=DOUBLE}, #{greenRatio,jdbcType=VARCHAR}, #{price,jdbcType=DECIMAL},
             #{exceededPrice,jdbcType=DECIMAL}, #{areaStatus,jdbcType=INTEGER}, #{saleStatus,jdbcType=INTEGER},
             #{regionalismCode,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR}, #{orderNum,jdbcType=VARCHAR},
             #{archiveCode,jdbcType=VARCHAR}, #{introduction,jdbcType=LONGVARCHAR})
@@ -308,7 +308,7 @@
         #{volumeRatio,jdbcType=DOUBLE},
       </if>
       <if test="greenRatio != null">
-        #{greenRatio,jdbcType=DOUBLE},
+        #{greenRatio,jdbcType=VARCHAR},
       </if>
       <if test="price != null">
         #{price,jdbcType=DECIMAL},
@@ -400,7 +400,7 @@
         volume_ratio = #{record.volumeRatio,jdbcType=DOUBLE},
       </if>
       <if test="record.greenRatio != null">
-        green_ratio = #{record.greenRatio,jdbcType=DOUBLE},
+        green_ratio = #{record.greenRatio,jdbcType=VARCHAR},
       </if>
       <if test="record.price != null">
         price = #{record.price,jdbcType=DECIMAL},
@@ -453,7 +453,7 @@
     land_certificate_number = #{record.landCertificateNumber,jdbcType=VARCHAR},
     land_use_permit_number = #{record.landUsePermitNumber,jdbcType=VARCHAR},
     volume_ratio = #{record.volumeRatio,jdbcType=DOUBLE},
-    green_ratio = #{record.greenRatio,jdbcType=DOUBLE},
+    green_ratio = #{record.greenRatio,jdbcType=VARCHAR},
     price = #{record.price,jdbcType=DECIMAL},
     exceeded_price = #{record.exceededPrice,jdbcType=DECIMAL},
     area_status = #{record.areaStatus,jdbcType=INTEGER},
@@ -486,7 +486,7 @@
     land_certificate_number = #{record.landCertificateNumber,jdbcType=VARCHAR},
     land_use_permit_number = #{record.landUsePermitNumber,jdbcType=VARCHAR},
     volume_ratio = #{record.volumeRatio,jdbcType=DOUBLE},
-    green_ratio = #{record.greenRatio,jdbcType=DOUBLE},
+    green_ratio = #{record.greenRatio,jdbcType=VARCHAR},
     price = #{record.price,jdbcType=DECIMAL},
     exceeded_price = #{record.exceededPrice,jdbcType=DECIMAL},
     area_status = #{record.areaStatus,jdbcType=INTEGER},
@@ -551,7 +551,7 @@
         volume_ratio = #{volumeRatio,jdbcType=DOUBLE},
       </if>
       <if test="greenRatio != null">
-        green_ratio = #{greenRatio,jdbcType=DOUBLE},
+        green_ratio = #{greenRatio,jdbcType=VARCHAR},
       </if>
       <if test="price != null">
         price = #{price,jdbcType=DECIMAL},
@@ -601,7 +601,7 @@
         land_certificate_number = #{landCertificateNumber,jdbcType=VARCHAR},
         land_use_permit_number = #{landUsePermitNumber,jdbcType=VARCHAR},
         volume_ratio = #{volumeRatio,jdbcType=DOUBLE},
-        green_ratio = #{greenRatio,jdbcType=DOUBLE},
+        green_ratio = #{greenRatio,jdbcType=VARCHAR},
         price = #{price,jdbcType=DECIMAL},
         exceeded_price = #{exceededPrice,jdbcType=DECIMAL},
         area_status = #{areaStatus,jdbcType=INTEGER},
@@ -631,7 +631,7 @@
         land_certificate_number = #{landCertificateNumber,jdbcType=VARCHAR},
         land_use_permit_number = #{landUsePermitNumber,jdbcType=VARCHAR},
         volume_ratio = #{volumeRatio,jdbcType=DOUBLE},
-        green_ratio = #{greenRatio,jdbcType=DOUBLE},
+        green_ratio = #{greenRatio,jdbcType=VARCHAR},
         price = #{price,jdbcType=DECIMAL},
         exceeded_price = #{exceededPrice,jdbcType=DECIMAL},
         area_status = #{areaStatus,jdbcType=INTEGER},

pro-base/src/main/resources/mybatis/buyingMore/BuyingMoreExtendMapper.xml

@@ -17,6 +17,7 @@
         and type = #{type}
       </if>
     </where>
+      order by b.created_at desc
   </select>
 
   <select id="getAllTransferProportion" resultType="java.lang.String">