update 特定收款账户特定财务分部

mec-biz/src/main/java/com/ym/mec/biz/dal/page/TenantAccountDetailQueryInfo.java

@@ -5,6 +5,8 @@ import com.ym.mec.biz.dal.entity.SysTenantAccountDetail.TransType;
 import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.util.Date;
+
 public class TenantAccountDetailQueryInfo extends QueryInfo {
 
 	@ApiModelProperty(value = "类型",required = false)
@@ -15,10 +17,10 @@ public class TenantAccountDetailQueryInfo extends QueryInfo {
 	private Integer userId;
 
 	@ApiModelProperty(value = "开始时间",required = false)
-	private String startTime;
+	private Date startTime;
 
 	@ApiModelProperty(value = "结束时间",required = false)
-	private String endTime;
+	private Date endTime;
 
 	public TransType getTransType() {
 		return transType;
@@ -44,19 +46,19 @@ public class TenantAccountDetailQueryInfo extends QueryInfo {
 		this.userId = userId;
 	}
 
-	public String getStartTime() {
+	public Date getStartTime() {
 		return startTime;
 	}
 
-	public void setStartTime(String startTime) {
+	public void setStartTime(Date startTime) {
 		this.startTime = startTime;
 	}
 
-	public String getEndTime() {
+	public Date getEndTime() {
 		return endTime;
 	}
 
-	public void setEndTime(String endTime) {
+	public void setEndTime(Date endTime) {
 		this.endTime = endTime;
 	}
 }

mec-biz/src/main/resources/config/mybatis/SysTenantAccountDetailMapper.xml

@@ -35,7 +35,8 @@
 				and create_time_ >= #{startTime}
 			</if>
 			<if test="endTime != null">
-				<![CDATA[and create_time_ <= #{startTime}]]></if>
+				<![CDATA[and create_time_ <= #{endTime}]]>
+			</if>
 		</where>
 	</sql>
 

mec-web/src/main/java/com/ym/mec/web/controller/SysTenantAccountController.java

@@ -17,8 +17,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.math.BigDecimal;
-
 @RequestMapping("sysTenantAccount")
 @Api(tags = "后台租客账户管理")
 @RestController
@@ -62,7 +60,7 @@ public class SysTenantAccountController extends BaseController {
     @ApiOperation(value = "增加分钟数")
     @PostMapping("/addMinutes")
     @PreAuthorize("@pcs.hasPermissions('sysTenantAccount/addMinutes')")
-    public Object addMinutes(Integer teacherId, Integer minutes, String memo) {
+    public Object addMinutes(Integer teacherId,Integer minutes, String memo) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed(HttpStatus.FORBIDDEN, "请登录");