Redeem vor 1 Tag
Ursprung
Commit
d47a2eb688

+ 1 - 0
src/main/java/com/steerinfo/baseinfo/meterreportwide/mapper/MeterReportWideMapper.xml

@@ -915,6 +915,7 @@
   <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     <include refid="select"/>
     <include refid="where"/>
+  order by OPERATION_TIME desc
   </select>
   <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     <include refid="select"/>

+ 22 - 21
src/main/java/com/steerinfo/baseinfo/trucktarecheckwide/controller/TruckTareCheckWideController.java

@@ -15,6 +15,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -89,14 +90,14 @@ public class TruckTareCheckWideController extends BaseRESTfulController {
         return success(truckTareCheckWide);
     }
 
-    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
-    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "Short")
-    //@RequiresPermissions("trucktarecheckwide:view")
-    @GetMapping(value = "/{id}")
-    public RESTfulResult get(@PathVariable Short id){
-        TruckTareCheckWide truckTareCheckWide = truckTareCheckWideService.getById(id);
-        return success(truckTareCheckWide);
-    }
+//    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+//    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "Short")
+//    //@RequiresPermissions("trucktarecheckwide:view")
+//    @GetMapping(value = "/{id}")
+//    public RESTfulResult get(@PathVariable BigDecimal id){
+//        TruckTareCheckWide truckTareCheckWide = truckTareCheckWideService.getById(id);
+//        return success(truckTareCheckWide);
+//    }
 
     @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象,并根据传过来的truckTareCheckWide信息来更新详细信息")
     @ApiImplicitParams({
@@ -105,22 +106,22 @@ public class TruckTareCheckWideController extends BaseRESTfulController {
     })
     //@RequiresPermissions("trucktarecheckwide:update")
     @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
-    public RESTfulResult update(@PathVariable Short id, @RequestBody TruckTareCheckWide model){
+    public RESTfulResult update(@PathVariable BigDecimal id, @RequestBody TruckTareCheckWide model){
         model.setId(id);
         TruckTareCheckWide truckTareCheckWide = truckTareCheckWideService.modify(model);
         return success(truckTareCheckWide);
     }
 
-    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
-    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "Short")
-    //@RequiresPermissions("trucktarecheckwide:delete")
-    @DeleteMapping(value = "/{id}")//Short
-    public RESTfulResult delete(@PathVariable String id){
-    	List<String> list = Arrays.asList(id.split(","));
-    	if(ListUtils.isNotEmpty(list)) {
-	    	List<Short> ids = ListUtils.convertList(list);
-			  truckTareCheckWideService.delete(ids);
-    	}
-      return success();
-    }
+//    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+//    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
+//    //@RequiresPermissions("trucktarecheckwide:delete")
+//    @DeleteMapping(value = "/{id}")//Short
+//    public RESTfulResult delete(@PathVariable String id){
+//    	List<String> list = Arrays.asList(id.split(","));
+//    	if(ListUtils.isNotEmpty(list)) {
+//	    	List<BigDecimal> ids = ListUtils.convertList(list);
+//			  truckTareCheckWideService.delete(ids);
+//    	}
+//      return success();
+//    }
 }

+ 3 - 2
src/main/java/com/steerinfo/baseinfo/trucktarecheckwide/mapper/TruckTareCheckWideMapper.xml

@@ -282,7 +282,7 @@
       </if>
     </where>
   </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
+  <delete id="deleteByPrimaryKey" parameterType="decimal">
     delete from TRUCK_TARE_CHECK_WIDE
     where ID = #{id,jdbcType=DECIMAL}
   </delete>
@@ -768,7 +768,7 @@
     </set>
     where ID = #{id,jdbcType=DECIMAL}
   </update>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
+  <select id="selectByPrimaryKey" parameterType="decimal" resultMap="BaseResultMap">
     <include refid="select"/>
     where ID = #{id,jdbcType=DECIMAL}
   </select>
@@ -779,6 +779,7 @@
   <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     <include refid="select"/>
     <include refid="whereLike"/>
+    ORDER BY CREATE_TIME DESC
   </select>
   <insert id="batchInsert" parameterType="java.util.List">
     insert into TRUCK_TARE_CHECK_WIDE 

+ 4 - 4
src/main/java/com/steerinfo/baseinfo/trucktarecheckwide/model/TruckTareCheckWide.java

@@ -8,11 +8,11 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 @ApiModel(value="null")
-public class TruckTareCheckWide implements IBasePO<Short> {
+public class TruckTareCheckWide implements IBasePO<BigDecimal> {
     private double base;
 
     @ApiModelProperty(value="",required=true)
-    private Short id;
+    private BigDecimal id;
 
     @ApiModelProperty(value="",required=false)
     private String baseSpotName;
@@ -115,11 +115,11 @@ public class TruckTareCheckWide implements IBasePO<Short> {
 
     private static final long serialVersionUID = 1L;
 
-    public Short getId() {
+    public BigDecimal getId() {
         return id;
     }
 
-    public void setId(Short id) {
+    public void setId(BigDecimal id) {
         this.id = id;
     }