优化代码

java110-bean/src/main/java/com/java110/dto/communitySpacePerson/CommunitySpacePersonDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.communitySpacePerson;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -14,18 +15,26 @@ import java.util.Date;
  **/
 public class CommunitySpacePersonDto extends PageDto implements Serializable {
 
+    public static final String STATE_S = "预约成功";
+    public static final String STATE_F = "预约失败";
+    public static final String STATE_W = "待审核";
+    public static final String STATE_WP = "待支付";
+
     private String receivableAmount;
-private String payWay;
-private String remark;
-private String receivedAmount;
-private String personName;
-private String spaceId;
-private String cspId;
-private String appointmentTime;
-private String personId;
-private String state;
-private String personTel;
-private String communityId;
+    private String payWay;
+    private String payWayName;
+    private String remark;
+    private String receivedAmount;
+    private String personName;
+    private String spaceId;
+    private String spaceName;
+    private String cspId;
+    private String appointmentTime;
+    private String personId;
+    private String state;
+    private String stateName;
+    private String personTel;
+    private String communityId;
 
 
     private Date createTime;
@@ -36,73 +45,96 @@ private String communityId;
     public String getReceivableAmount() {
         return receivableAmount;
     }
-public void setReceivableAmount(String receivableAmount) {
+
+    public void setReceivableAmount(String receivableAmount) {
         this.receivableAmount = receivableAmount;
     }
-public String getPayWay() {
+
+    public String getPayWay() {
         return payWay;
     }
-public void setPayWay(String payWay) {
+
+    public void setPayWay(String payWay) {
         this.payWay = payWay;
     }
-public String getRemark() {
+
+    public String getRemark() {
         return remark;
     }
-public void setRemark(String remark) {
+
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-public String getReceivedAmount() {
+
+    public String getReceivedAmount() {
         return receivedAmount;
     }
-public void setReceivedAmount(String receivedAmount) {
+
+    public void setReceivedAmount(String receivedAmount) {
         this.receivedAmount = receivedAmount;
     }
-public String getPersonName() {
+
+    public String getPersonName() {
         return personName;
     }
-public void setPersonName(String personName) {
+
+    public void setPersonName(String personName) {
         this.personName = personName;
     }
-public String getSpaceId() {
+
+    public String getSpaceId() {
         return spaceId;
     }
-public void setSpaceId(String spaceId) {
+
+    public void setSpaceId(String spaceId) {
         this.spaceId = spaceId;
     }
-public String getCspId() {
+
+    public String getCspId() {
         return cspId;
     }
-public void setCspId(String cspId) {
+
+    public void setCspId(String cspId) {
         this.cspId = cspId;
     }
-public String getAppointmentTime() {
+
+    public String getAppointmentTime() {
         return appointmentTime;
     }
-public void setAppointmentTime(String appointmentTime) {
+
+    public void setAppointmentTime(String appointmentTime) {
         this.appointmentTime = appointmentTime;
     }
-public String getPersonId() {
+
+    public String getPersonId() {
         return personId;
     }
-public void setPersonId(String personId) {
+
+    public void setPersonId(String personId) {
         this.personId = personId;
     }
-public String getState() {
+
+    public String getState() {
         return state;
     }
-public void setState(String state) {
+
+    public void setState(String state) {
         this.state = state;
     }
-public String getPersonTel() {
+
+    public String getPersonTel() {
         return personTel;
     }
-public void setPersonTel(String personTel) {
+
+    public void setPersonTel(String personTel) {
         this.personTel = personTel;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
 
@@ -122,4 +154,28 @@ public void setCommunityId(String communityId) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getPayWayName() {
+        return payWayName;
+    }
+
+    public void setPayWayName(String payWayName) {
+        this.payWayName = payWayName;
+    }
+
+    public String getSpaceName() {
+        return spaceName;
+    }
+
+    public void setSpaceName(String spaceName) {
+        this.spaceName = spaceName;
+    }
+
+    public String getStateName() {
+        return stateName;
+    }
+
+    public void setStateName(String stateName) {
+        this.stateName = stateName;
+    }
 }

java110-db/src/main/resources/mapper/community/CommunitySpacePersonV1ServiceDaoImplMapper.xml

@@ -5,165 +5,169 @@
 <mapper namespace="communitySpacePersonV1ServiceDaoImpl">
 
 
-
-
-
     <!-- 保存小区场地预约信息 add by wuxw 2018-07-03 -->
     <insert id="saveCommunitySpacePersonInfo" parameterType="Map">
         insert into community_space_person(
-receivable_amount,pay_way,remark,received_amount,person_name,space_id,csp_id,appointment_time,person_id,state,person_tel,community_id
-) values (
-#{receivableAmount},#{payWay},#{remark},#{receivedAmount},#{personName},#{spaceId},#{cspId},#{appointmentTime},#{personId},#{state},#{personTel},#{communityId}
-)
+        receivable_amount,pay_way,remark,received_amount,person_name,space_id,csp_id,appointment_time,person_id,state,person_tel,community_id
+        ) values (
+        #{receivableAmount},#{payWay},#{remark},#{receivedAmount},#{personName},#{spaceId},#{cspId},#{appointmentTime},#{personId},#{state},#{personTel},#{communityId}
+        )
     </insert>
 
 
-
     <!-- 查询小区场地预约信息 add by wuxw 2018-07-03 -->
     <select id="getCommunitySpacePersonInfo" parameterType="Map" resultType="Map">
-        select  t.receivable_amount,t.receivable_amount receivableAmount,t.pay_way,t.pay_way payWay,t.remark,t.status_cd,t.status_cd statusCd,t.received_amount,t.received_amount receivedAmount,t.person_name,t.person_name personName,t.space_id,t.space_id spaceId,t.csp_id,t.csp_id cspId,t.appointment_time,t.appointment_time appointmentTime,t.person_id,t.person_id personId,t.state,t.person_tel,t.person_tel personTel,t.community_id,t.community_id communityId 
-from community_space_person t 
-where 1 =1 
-<if test="receivableAmount !=null and receivableAmount != ''">
-   and t.receivable_amount= #{receivableAmount}
-</if> 
-<if test="payWay !=null and payWay != ''">
-   and t.pay_way= #{payWay}
-</if> 
-<if test="remark !=null and remark != ''">
-   and t.remark= #{remark}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="receivedAmount !=null and receivedAmount != ''">
-   and t.received_amount= #{receivedAmount}
-</if> 
-<if test="personName !=null and personName != ''">
-   and t.person_name= #{personName}
-</if> 
-<if test="spaceId !=null and spaceId != ''">
-   and t.space_id= #{spaceId}
-</if> 
-<if test="cspId !=null and cspId != ''">
-   and t.csp_id= #{cspId}
-</if> 
-<if test="appointmentTime !=null and appointmentTime != ''">
-   and t.appointment_time= #{appointmentTime}
-</if> 
-<if test="personId !=null and personId != ''">
-   and t.person_id= #{personId}
-</if> 
-<if test="state !=null and state != ''">
-   and t.state= #{state}
-</if> 
-<if test="personTel !=null and personTel != ''">
-   and t.person_tel= #{personTel}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-order by t.create_time desc
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
+        select t.receivable_amount,t.receivable_amount receivableAmount,t.pay_way,t.pay_way
+        payWay,t.remark,t.status_cd,t.status_cd statusCd,t.received_amount,t.received_amount
+        receivedAmount,t.person_name,t.person_name personName,t.space_id,t.space_id spaceId,t.csp_id,t.csp_id
+        cspId,t.appointment_time,t.appointment_time appointmentTime,t.person_id,t.person_id
+        personId,t.state,t.person_tel,t.person_tel personTel,t.community_id,t.community_id communityId,td.name stateName,td1.name payWayName,
+        cs.name spaceName,t.create_time createTime
+        from community_space_person t
+        left join community_space cs on t.space_id = cs.space_id and cs.status_cd = '0'
+        left join t_dict td on t.state = td.status_cd and td.table_name = 'community_space_person' and td.table_columns = 'state'
+        left join t_dict td1 on t.pay_way = td1.status_cd and td1.table_name = 'community_space_person' and td1.table_columns = 'pay_way'
+
+        where 1 =1
+        <if test="receivableAmount !=null and receivableAmount != ''">
+            and t.receivable_amount= #{receivableAmount}
+        </if>
+        <if test="payWay !=null and payWay != ''">
+            and t.pay_way= #{payWay}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="receivedAmount !=null and receivedAmount != ''">
+            and t.received_amount= #{receivedAmount}
+        </if>
+        <if test="personName !=null and personName != ''">
+            and t.person_name= #{personName}
+        </if>
+        <if test="spaceId !=null and spaceId != ''">
+            and t.space_id= #{spaceId}
+        </if>
+        <if test="cspId !=null and cspId != ''">
+            and t.csp_id= #{cspId}
+        </if>
+        <if test="appointmentTime !=null and appointmentTime != ''">
+            and t.appointment_time= #{appointmentTime}
+        </if>
+        <if test="personId !=null and personId != ''">
+            and t.person_id= #{personId}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="personTel !=null and personTel != ''">
+            and t.person_tel= #{personTel}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        order by t.create_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
 
     </select>
 
 
-
-
     <!-- 修改小区场地预约信息 add by wuxw 2018-07-03 -->
     <update id="updateCommunitySpacePersonInfo" parameterType="Map">
-        update  community_space_person t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="receivableAmount !=null and receivableAmount != ''">
-, t.receivable_amount= #{receivableAmount}
-</if> 
-<if test="payWay !=null and payWay != ''">
-, t.pay_way= #{payWay}
-</if> 
-<if test="remark !=null and remark != ''">
-, t.remark= #{remark}
-</if> 
-<if test="receivedAmount !=null and receivedAmount != ''">
-, t.received_amount= #{receivedAmount}
-</if> 
-<if test="personName !=null and personName != ''">
-, t.person_name= #{personName}
-</if> 
-<if test="spaceId !=null and spaceId != ''">
-, t.space_id= #{spaceId}
-</if> 
-<if test="appointmentTime !=null and appointmentTime != ''">
-, t.appointment_time= #{appointmentTime}
-</if> 
-<if test="personId !=null and personId != ''">
-, t.person_id= #{personId}
-</if> 
-<if test="state !=null and state != ''">
-, t.state= #{state}
-</if> 
-<if test="personTel !=null and personTel != ''">
-, t.person_tel= #{personTel}
-</if> 
-<if test="communityId !=null and communityId != ''">
-, t.community_id= #{communityId}
-</if> 
- where 1=1 <if test="cspId !=null and cspId != ''">
-and t.csp_id= #{cspId}
-</if> 
+        update community_space_person t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="receivableAmount !=null and receivableAmount != ''">
+            , t.receivable_amount= #{receivableAmount}
+        </if>
+        <if test="payWay !=null and payWay != ''">
+            , t.pay_way= #{payWay}
+        </if>
+        <if test="remark !=null and remark != ''">
+            , t.remark= #{remark}
+        </if>
+        <if test="receivedAmount !=null and receivedAmount != ''">
+            , t.received_amount= #{receivedAmount}
+        </if>
+        <if test="personName !=null and personName != ''">
+            , t.person_name= #{personName}
+        </if>
+        <if test="spaceId !=null and spaceId != ''">
+            , t.space_id= #{spaceId}
+        </if>
+        <if test="appointmentTime !=null and appointmentTime != ''">
+            , t.appointment_time= #{appointmentTime}
+        </if>
+        <if test="personId !=null and personId != ''">
+            , t.person_id= #{personId}
+        </if>
+        <if test="state !=null and state != ''">
+            , t.state= #{state}
+        </if>
+        <if test="personTel !=null and personTel != ''">
+            , t.person_tel= #{personTel}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            , t.community_id= #{communityId}
+        </if>
+        where 1=1
+        <if test="cspId !=null and cspId != ''">
+            and t.csp_id= #{cspId}
+        </if>
 
     </update>
 
     <!-- 查询小区场地预约数量 add by wuxw 2018-07-03 -->
-     <select id="queryCommunitySpacePersonsCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from community_space_person t 
-where 1 =1 
-<if test="receivableAmount !=null and receivableAmount != ''">
-   and t.receivable_amount= #{receivableAmount}
-</if> 
-<if test="payWay !=null and payWay != ''">
-   and t.pay_way= #{payWay}
-</if> 
-<if test="remark !=null and remark != ''">
-   and t.remark= #{remark}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="receivedAmount !=null and receivedAmount != ''">
-   and t.received_amount= #{receivedAmount}
-</if> 
-<if test="personName !=null and personName != ''">
-   and t.person_name= #{personName}
-</if> 
-<if test="spaceId !=null and spaceId != ''">
-   and t.space_id= #{spaceId}
-</if> 
-<if test="cspId !=null and cspId != ''">
-   and t.csp_id= #{cspId}
-</if> 
-<if test="appointmentTime !=null and appointmentTime != ''">
-   and t.appointment_time= #{appointmentTime}
-</if> 
-<if test="personId !=null and personId != ''">
-   and t.person_id= #{personId}
-</if> 
-<if test="state !=null and state != ''">
-   and t.state= #{state}
-</if> 
-<if test="personTel !=null and personTel != ''">
-   and t.person_tel= #{personTel}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
+    <select id="queryCommunitySpacePersonsCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from community_space_person t
+        where 1 =1
+        <if test="receivableAmount !=null and receivableAmount != ''">
+            and t.receivable_amount= #{receivableAmount}
+        </if>
+        <if test="payWay !=null and payWay != ''">
+            and t.pay_way= #{payWay}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="receivedAmount !=null and receivedAmount != ''">
+            and t.received_amount= #{receivedAmount}
+        </if>
+        <if test="personName !=null and personName != ''">
+            and t.person_name= #{personName}
+        </if>
+        <if test="spaceId !=null and spaceId != ''">
+            and t.space_id= #{spaceId}
+        </if>
+        <if test="cspId !=null and cspId != ''">
+            and t.csp_id= #{cspId}
+        </if>
+        <if test="appointmentTime !=null and appointmentTime != ''">
+            and t.appointment_time= #{appointmentTime}
+        </if>
+        <if test="personId !=null and personId != ''">
+            and t.person_id= #{personId}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="personTel !=null and personTel != ''">
+            and t.person_tel= #{personTel}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
 
 
-     </select>
+    </select>
 
 </mapper>

service-community/src/main/java/com/java110/community/cmd/communitySpace/SaveCommunitySpacePersonCmd.java

@@ -22,16 +22,56 @@ import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.doc.annotation.*;
+import com.java110.dto.communitySpacePerson.CommunitySpacePersonDto;
 import com.java110.intf.community.ICommunitySpacePersonV1InnerServiceSMO;
 import com.java110.po.communitySpacePerson.CommunitySpacePersonPo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
 import com.java110.vo.ResultVo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
+
+@Java110CmdDoc(title = "预约场地",
+        description = "系统中的预约场地",
+        httpMethod = "post",
+        url = "http://{ip}:{port}/app/communitySpace.saveCommunitySpacePerson",
+        resource = "communityDoc",
+        author = "吴学文",
+        serviceCode = "communitySpace.saveCommunitySpacePerson"
+)
+
+@Java110ParamsDoc(params = {
+        @Java110ParamDoc(name = "page",type = "int",length = 11, remark = "分页页数"),
+        @Java110ParamDoc(name = "row",type = "int", length = 11, remark = "分页行数"),
+        @Java110ParamDoc(name = "communityId", length = 30, remark = "小区ID"),
+        @Java110ParamDoc(name = "appointmentDate", length = 30, remark = "预约日期 YYYY-MM-DD"),
+        @Java110ParamDoc(name = "appointmentTime", length = 30, remark = "预约时间 HH24:MI"),
+        @Java110ParamDoc(name = "payWay", length = 12, remark = "支付方式"),
+        @Java110ParamDoc(name = "personName", length = 64, remark = "预约人"),
+        @Java110ParamDoc(name = "personTel", length = 30, remark = "预约人电话"),
+        @Java110ParamDoc(name = "receivableAmount", length = 30, remark = "应收金额"),
+        @Java110ParamDoc(name = "receivedAmount", length = 30, remark = "实收金额"),
+        @Java110ParamDoc(name = "spaceId", length = 30, remark = "场地ID"),
+})
+
+@Java110ResponseDoc(
+        params = {
+                @Java110ParamDoc(name = "code", type = "int", length = 11, defaultValue = "0", remark = "返回编号，0 成功 其他失败"),
+                @Java110ParamDoc(name = "msg", type = "String", length = 250, defaultValue = "成功", remark = "描述"),
+
+        }
+)
+
+@Java110ExampleDoc(
+        reqBody="{\"spaceId\":\"102022093043260007\",\"personName\":\"wuxw\",\"personTel\":\"18909711443\",\"appointmentTime\":\"01:00\",\"receivableAmount\":\"10\",\"receivedAmount\":\"10\",\"payWay\":\"2\",\"state\":\"S\",\"remark\":\"123\",\"appointmentDate\":\"2022-09-01\",\"communityId\":\"2022081539020475\"}",
+        resBody="{\"code\":0,\"msg\":\"成功\"}"
+)
+
 /**
  * 类表述：保存
  * 服务编码：communitySpacePerson.saveCommunitySpacePerson
@@ -62,7 +102,6 @@ public class SaveCommunitySpacePersonCmd extends Cmd {
         Assert.hasKeyAndValue(reqJson, "receivedAmount", "请求报文中未包含receivedAmount");
         Assert.hasKeyAndValue(reqJson, "payWay", "请求报文中未包含payWay");
         Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");
-        Assert.hasKeyAndValue(reqJson, "state", "请求报文中未包含state");
 
     }
 
@@ -70,8 +109,13 @@ public class SaveCommunitySpacePersonCmd extends Cmd {
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
+
+
         CommunitySpacePersonPo communitySpacePersonPo = BeanConvertUtil.covertBean(reqJson, CommunitySpacePersonPo.class);
         communitySpacePersonPo.setCspId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
+        if(StringUtil.isEmpty(communitySpacePersonPo.getState())){
+            communitySpacePersonPo.setState(CommunitySpacePersonDto.STATE_W);
+        }
         int flag = communitySpacePersonV1InnerServiceSMOImpl.saveCommunitySpacePerson(communitySpacePersonPo);
 
         if (flag < 1) {