Your Name
2023-05-31 b8e7bb1791ff41be5ee8150cc46af082d7444a65
service-report/src/main/java/com/java110/report/cmd/owner/QueryOwnerDiningCmd.java
@@ -10,6 +10,7 @@
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.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
@@ -31,17 +32,18 @@
    @Override
    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
        Assert.hasKeyAndValue(reqJson, "communityId", "未包含小区");
        Assert.hasKeyAndValue(reqJson, "startDate", "未包含开始时间");
        Assert.hasKeyAndValue(reqJson, "endDate", "未包含结束时间");
        String startDate = reqJson.getString("startDate");
        String endDate = reqJson.getString("endDate");
        if (!startDate.contains(":")) {
            startDate += " 00:00:00";
            reqJson.put("startDate", startDate);
        }
        if (!endDate.contains(":")) {
            endDate += " 23:59:59";
            reqJson.put("endDate", endDate);
        if(reqJson.containsKey("startDate") && reqJson.containsKey("endDate")) {
            String startDate = reqJson.getString("startDate");
            String endDate = reqJson.getString("endDate");
            if (!StringUtil.isEmpty(startDate) && !startDate.contains(":")) {
                startDate += " 00:00:00";
                reqJson.put("startDate", startDate);
            }
            if (!StringUtil.isEmpty(endDate) && !endDate.contains(":")) {
                endDate += " 23:59:59";
                reqJson.put("endDate", endDate);
            }
        }
    }