523096025 4 роки тому
батько
коміт
6070d28cd8

+ 15 - 2
huimv-smart-management/src/main/java/com/huimv/management/controller/YearPigBaseController.java

@@ -1,6 +1,7 @@
  package com.huimv.management.controller;
 
 import java.lang.reflect.InvocationTargetException;
+import java.text.NumberFormat;
 import java.util.*;
 
 import com.huimv.management.entity.UnitEntity;
@@ -152,6 +153,13 @@ public class YearPigBaseController {
         return R.ok();
     }
 
+     //批量出栏
+     @RequestMapping("/suchApp")
+     public R suchApp(@RequestBody Integer[] ids){
+         yearPigBaseService.suchApp(ids);
+         return R.ok();
+     }
+
     //认养未认养比例
     @RequestMapping("/outAndInProportion")
     public R outAndInProportion(Integer formFarmId){
@@ -159,13 +167,18 @@ public class YearPigBaseController {
         Integer adopted = yearPigBaseService.findByFosterStatus(1,formFarmId);
         //未认养
         Integer notAdopted = yearPigBaseService.findByFosterStatus(0,formFarmId);
-        Map<String,Integer> resultMap = new HashMap<String,Integer>();
+        Map resultMap = new HashMap();
         resultMap.put("adopted",adopted);
         resultMap.put("notAdopted",notAdopted);
         Integer total = notAdopted + adopted;
         resultMap.put("total",total);
+        NumberFormat numberFormat = NumberFormat.getInstance();
+        numberFormat.setMaximumFractionDigits(2);
+        String adoptedPercent =numberFormat.format((float)adopted/(float)total*100);
+        String notAdoptedPercent =numberFormat.format((float)notAdopted/(float)total*100);
 
-
+        resultMap.put("adoptedPercent",adoptedPercent+"%");
+        resultMap.put("notAdoptedPercent",notAdoptedPercent+"%");
 
         return R.ok().put("data",resultMap);
     }

+ 2 - 0
huimv-smart-management/src/main/java/com/huimv/management/dao/YearPigBaseDao.java

@@ -36,4 +36,6 @@ public interface YearPigBaseDao extends BaseMapper<YearPigBaseEntity> {
     List<CountOut> suchStatisticsMonth(@Param("farmId") Integer farmId,@Param("ew") QueryWrapper<YearPigBaseEntity> wrapper);
 
     IPage<PigBaseVo> fattenList(@Param("page")IPage page, @Param("ew") QueryWrapper<DrinkingWaterVo> queryWrapper);
+
+    void suchApp(Integer[] ids);
 }

+ 2 - 0
huimv-smart-management/src/main/java/com/huimv/management/service/YearPigBaseService.java

@@ -55,5 +55,7 @@ public interface YearPigBaseService extends IService<YearPigBaseEntity> {
     PageUtils fattenList(Map<String, Object> params);
 
     Integer findByFosterStatus(int i, Integer formFarmId);
+
+    void suchApp(Integer[] ids);
 }
 

+ 5 - 0
huimv-smart-management/src/main/java/com/huimv/management/service/impl/YearPigBaseServiceImpl.java

@@ -166,6 +166,11 @@ public class YearPigBaseServiceImpl extends ServiceImpl<YearPigBaseDao, YearPigB
     }
 
     @Override
+    public void suchApp(Integer[] ids) {
+        pigBaseDao.suchApp(ids);
+    }
+
+    @Override
     public Integer findByoutFenceStatus(int i, Integer farmId) {
         LambdaQueryWrapper<YearPigBaseEntity> wrapper = Wrappers.lambdaQuery();
         wrapper.eq(YearPigBaseEntity::getFarmId,farmId);

+ 7 - 0
huimv-smart-management/src/main/resources/mapper/management/YearPigBaseDao.xml

@@ -31,6 +31,13 @@
       </foreach>
   </update>
 
+    <update id="suchApp">
+        update mgt_year_pig_base set out_fence_status=1 ,out_fence_time = now()
+        where eartag in
+        <foreach collection="ids" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </update>
     <select id="list" resultType="com.huimv.management.entity.vo.PigBaseVo">
         SELECT
           base.id,