Merge branch 'master' of http://git.ycjcjy.com/xiangsong/xs-service

src/main/java/com/huiju/estateagents/property/model/TpAnnouncement.java

@@ -81,4 +81,10 @@ public class TpAnnouncement implements Serializable {
     @TableField(exist = false)
     private List<String> imgList;
 
+    @TableField(exist = false)
+    private String startCreateDate;
+
+    @TableField(exist = false)
+    private String endCreateDate;
+
 }

src/main/java/com/huiju/estateagents/property/service/impl/BillStatementServiceImpl.java

@@ -66,6 +66,8 @@ public class BillStatementServiceImpl extends ServiceImpl<BillStatementMapper, B
         String orderStatus = jsonObject.getString("orderStatus");
         // 缴费方式
         String payType = jsonObject.getString("payType");
+        String startCreateDate = jsonObject.getString("startCreateDate");
+        String endCreateDate = jsonObject.getString("endCreateDate");
 
         // 参数
         Map<String, Object> map = Maps.newHashMap();
@@ -77,6 +79,8 @@ public class BillStatementServiceImpl extends ServiceImpl<BillStatementMapper, B
         map.put("orgId", userElement.getOrgId());
         map.put("orderStatus", orderStatus);
         map.put("payType", payType);
+        map.put("startCreateDate", startCreateDate);
+        map.put("endCreateDate", endCreateDate);
 
         Page<TpBillOrder> page = new Page<>();
         page.setCurrent(pageNum);

src/main/java/com/huiju/estateagents/property/service/impl/BuildingOwnerInfoServiceImpl.java

@@ -111,6 +111,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         tpBuildingOwnerInfo.setOrgId(userElement.getOrgId());
         Long pageNum = jsonObject.getLong("pageNum") == null ? 1 : jsonObject.getLong("pageNum");
         Long pageSize = jsonObject.getLong("pageSize") == null ? 10 : jsonObject.getLong("pageSize");
+        tpBuildingOwnerInfo.setVerifyStatus(jsonObject.getString("verifyStatus"));
 
         Page page = new Page(pageNum,pageSize);
 
@@ -125,6 +126,11 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
                 }
             }
 
+            TaUser taUser = taUserMapper.selectById(e.getUpdateName());
+            if (null != taUser){
+                e.setUpdateName(taUser.getUserName());
+            }
+
         });
 
         Map<String, Object> retMap = Maps.newHashMap();

src/main/java/com/huiju/estateagents/property/service/impl/TpAnnouncementServiceImpl.java

@@ -75,6 +75,10 @@ private  TpAnnouncementMapper tpAnnouncementMapper;
             tpAnnouncement.setAnnType(annType);
         }
 
+        tpAnnouncement.setStatus(jsonobject.getString("status"));
+        tpAnnouncement.setStartCreateDate(jsonobject.getString("startCreateDate"));
+        tpAnnouncement.setEndCreateDate(jsonobject.getString("endCreateDate"));
+
         // 分页
         Page<TpBuildingOwnerInfo> page = new Page<>();
         page.setSize(pageSize == null ? 10 : pageSize);

src/main/java/com/huiju/estateagents/property/service/impl/TpTicketServiceImpl.java

@@ -167,6 +167,16 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
 
             TaPerson person =taPersonMapper.selectById(tpTicket.getCreateUser());
             tpTicketVO.setCreateUserNmae(StringUtils.isNotEmpty(person.getName()) ? person.getName() : person.getNickname());
+
+            // 获取房产信息
+            LambdaQueryWrapper<TaUserVerify> userVerifyLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            userVerifyLambdaQueryWrapper.eq(TaUserVerify::getPersonId,person.getPersonId());
+            List<TaUserVerify> taUserVerifies = taUserVerifyMapper.selectList(userVerifyLambdaQueryWrapper);
+            if (taUserVerifies.size() > 0){
+                TaUserVerify taUserVerify = taUserVerifies.get(0);
+                tpTicketVO.setAddress(taUserVerify.getPhaseName()+taUserVerify.getBuildingName()+taUserVerify.getUnitName()+taUserVerify.getLevelName()+taUserVerify.getRoomNoName());
+            }
+
             tpTicketArrayList.add(tpTicketVO);
         }
         HashMap map=new HashMap<>();

src/main/java/com/huiju/estateagents/property/vo/TpTicketVO.java

@@ -87,4 +87,6 @@ public class TpTicketVO extends TpTicket {
     private Boolean isPay;
 
     private List<TaUserVerify> userVerifyList;
+
+    private String address;
 }

src/main/resources/mapper/property/BillOrderMapper.xml

@@ -37,6 +37,12 @@
                 <if test="map.payType != null">
                     and tbs.pay_type = #{map.payType}
                 </if>
+                <if test="map.startCreateDate != null and map.startCreateDate !=''">
+                    and tbs.create_time >= #{map.startCreateDate}
+                </if>
+                <if test="map.endCreateDate != null and map.endCreateDate !=''">
+                    and tbs.create_time &lt;= #{map.endCreateDate}
+                </if>
             </trim>
         </where>
         group by tbo.order_bumber

src/main/resources/mapper/property/TpAnnouncementMapper.xml

@@ -20,6 +20,15 @@
         </if>
         <if test="record.annType != null and record.annType != ''" >
           AND ann_type = #{record.annType,jdbcType=VARCHAR}
+        </if>
+        <if test="record.status != null and record.status != ''" >
+          AND status = #{record.status,jdbcType=VARCHAR}
+        </if>
+        <if test="record.startCreateDate != null and record.startCreateDate != ''">
+          AND DATE_FORMAT(create_date, '%Y-%m-%d') &gt;= #{record.startCreateDate}
+        </if>
+        <if test="record.endCreateDate != null and record.endCreateDate != ''">
+          AND DATE_FORMAT(create_date, '%Y-%m-%d') &lt;= #{record.endCreateDate}
         </if>
           AND org_id = #{record.orgId,jdbcType=INTEGER}
           ORDER BY sort DESC,create_date desc

src/main/resources/mapper/property/TpBuildingOwnerInfoMapper.xml

@@ -108,6 +108,9 @@
         <if test="tpBuildingOwnerInfo.roleName != null and tpBuildingOwnerInfo.roleName != ''">
             and t.role_id = #{tpBuildingOwnerInfo.roleName}
         </if>
+        <if test="tpBuildingOwnerInfo.verifyStatus != null and tpBuildingOwnerInfo.verifyStatus != ''">
+            and u.verify_status = #{tpBuildingOwnerInfo.verifyStatus}
+        </if>
         order by u.create_date desc
     </select>
     <select id="getAvailableProp" resultType="java.lang.Integer">