测试问题修复
This commit is contained in:
parent
5529965946
commit
253f8f2c36
|
|
@ -60,4 +60,6 @@ public class CookEvaluaDetail extends BaseEntity {
|
|||
|
||||
@ApiModelProperty("评价图片")
|
||||
private List<String> pictureList;
|
||||
|
||||
private String avatar;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ public class HealthPopularArticleController extends BaseController {
|
|||
//@RequiresPermissions("health:article:export")
|
||||
@SysLog(title = "营养科普", businessType = OperaType.EXPORT, logType = 1,module = "仓储管理->导出营养科普")
|
||||
@PostMapping("/export")
|
||||
public void export(HttpServletResponse response, HealthPopularArticle healthPopularArticle) {
|
||||
public void export(HttpServletResponse response, @RequestBody HealthPopularArticle healthPopularArticle) {
|
||||
List<HealthPopularArticle> list = healthPopularArticleService.selectHealthPopularArticleList(healthPopularArticle);
|
||||
ExcelUtil<HealthPopularArticle> util = new ExcelUtil<HealthPopularArticle>(HealthPopularArticle.class);
|
||||
util.exportExcel(response, list, "营养科普数据");
|
||||
|
|
@ -80,7 +80,7 @@ public class HealthPopularArticleController extends BaseController {
|
|||
//@RequiresPermissions("health:article:add")
|
||||
@SysLog(title = "营养科普", businessType = OperaType.INSERT, logType = 1,module = "仓储管理->新增营养科普")
|
||||
@PostMapping
|
||||
public AjaxResult add(HealthPopularArticle healthPopularArticle) {
|
||||
public AjaxResult add(@RequestBody HealthPopularArticle healthPopularArticle) {
|
||||
try {
|
||||
return toAjax(healthPopularArticleService.insertHealthPopularArticle(healthPopularArticle));
|
||||
} catch (Exception e) {
|
||||
|
|
@ -96,7 +96,7 @@ public class HealthPopularArticleController extends BaseController {
|
|||
//@RequiresPermissions("health:article:edit")
|
||||
@SysLog(title = "营养科普", businessType = OperaType.UPDATE, logType = 1,module = "仓储管理->修改营养科普")
|
||||
@PostMapping("/edit")
|
||||
public AjaxResult edit(HealthPopularArticle article) {
|
||||
public AjaxResult edit(@RequestBody HealthPopularArticle article) {
|
||||
try {
|
||||
return toAjax(healthPopularArticleService.updateHealthPopularArticle(article));
|
||||
} catch (Exception e) {
|
||||
|
|
|
|||
|
|
@ -209,14 +209,14 @@ public class ImsInventoryServiceImpl implements IImsInventoryService
|
|||
} else {
|
||||
dayNum = -1;
|
||||
}
|
||||
if(dayNum >0 && content.getExpireState() !=null){
|
||||
if(dayNum >0){
|
||||
list.stream().filter(l -> l.getExpireState() != null)
|
||||
.forEach(l -> {
|
||||
if(l.getExpireDay() !=null){
|
||||
Integer betweenDay = l.getExpireDay();
|
||||
if(betweenDay<=0){
|
||||
if(betweenDay<0){
|
||||
l.setExpireState(1);
|
||||
} else if (betweenDay >0 && betweenDay <= dayNum) {
|
||||
} else if (betweenDay >=0 && betweenDay <= dayNum) {
|
||||
l.setExpireState(3);
|
||||
}else{
|
||||
l.setExpireState(2);
|
||||
|
|
@ -224,11 +224,16 @@ public class ImsInventoryServiceImpl implements IImsInventoryService
|
|||
|
||||
}
|
||||
});
|
||||
if(content.getExpireState() !=null){
|
||||
List<ExpireWarningVO> warningList = list.stream().filter(l -> Objects.equals(l.getExpireState(), content.getExpireState())).collect(Collectors.toList());
|
||||
System.out.println("warningList = " + warningList);
|
||||
System.out.println("warningList.size = " + warningList.size());
|
||||
return warningList;
|
||||
}else {
|
||||
return list;
|
||||
}
|
||||
|
||||
|
||||
List<ExpireWarningVO> warningList = list.stream().filter(l -> Objects.equals(l.getExpireState(), content.getExpireState())).collect(Collectors.toList());
|
||||
System.out.println("warningList = " + warningList);
|
||||
System.out.println("warningList.size = " + warningList.size());
|
||||
return warningList;
|
||||
}
|
||||
return list;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -281,7 +281,8 @@ public class FMSGCallBack_V31 implements HCNetSDK.FMSGCallBack_V31 {
|
|||
}
|
||||
break;
|
||||
default:
|
||||
System.out.println("报警类型" + Integer.toHexString(lCommand));
|
||||
// System.out.println("报警类型" + Integer.toHexString(lCommand));
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,12 +17,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<result property="updateBy" column="update_by" />
|
||||
<result property="updateTime" column="update_time" />
|
||||
<result property="photoUrl" column="photo_url" />
|
||||
<result property="avatar" column="avatar" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectCookEvaluaDetailVo">
|
||||
select ced.evalua_detail_id, ced.evalua_id, ced.meal_type, ced.meal_id, ced.star_level,
|
||||
ced.description, ced.create_by, ced.create_time, ced.update_by, ced.update_time,
|
||||
su.nick_name, cd.dishes_name,su.photo_url
|
||||
su.nick_name, cd.dishes_name,su.photo_url,su.avatar
|
||||
from cook_evalua_detail ced
|
||||
left join cook_dishes cd on cd.dishes_id = ced.meal_id
|
||||
left join cook_evalua_order ceo on ceo.evalua_id = ced.evalua_id
|
||||
|
|
|
|||
|
|
@ -352,7 +352,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
|
||||
|
||||
<select id="selectHealthChronicList" resultType="com.bonus.canteen.core.health.domain.HealthPersonInfo">
|
||||
SELECT distinct chronic_id as chronic_ids,chronic_name as chronic_names from health_chronic where chronic_id in (${chronicIds})
|
||||
SELECT distinct chronic_id as chronic_ids,chronic_name as chronic_names from health_chronic
|
||||
WHERE FIND_IN_SET(chronic_id, #{chronicIds})
|
||||
</select>
|
||||
|
||||
<select id="getSimpleInfo" resultType="com.bonus.canteen.core.health.domain.HealthPersonInfo">
|
||||
|
|
|
|||
|
|
@ -208,7 +208,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
dci.update_time,
|
||||
dci.deal_with_status,
|
||||
dci.total_profit_loss,
|
||||
dicd.differ_num,
|
||||
dci.process_instance_id,
|
||||
dw.area_id,
|
||||
aa.area_name,
|
||||
|
|
|
|||
|
|
@ -292,6 +292,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<where>
|
||||
did.expire_time is not null
|
||||
and did.inventory_num > 0
|
||||
and mm.material_name is not null
|
||||
<!-- and (-->
|
||||
<!-- did.expire_time <![CDATA[ <]]> NOW() -- 已过期-->
|
||||
<!-- OR TIMESTAMPDIFF(DAY, NOW(), did.expire_time) <![CDATA[ <= ]]> mm.shelf_life_days -- 临期-->
|
||||
|
|
|
|||
|
|
@ -438,12 +438,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
) r group by supplier_id
|
||||
) last on isr.supplier_id=last.supplier_id
|
||||
where isr.del_flag='0'
|
||||
<if test="content.supplierId != null">
|
||||
and isr.area_id = #{content.areaId}
|
||||
</if>
|
||||
<if test="content.supplierId != null">
|
||||
and isr.supplier_id = #{content.supplierId}
|
||||
</if>
|
||||
<if test="content.areaIdList != null and content.areaIdList.size() > 0">
|
||||
and isr.area_id in
|
||||
<foreach collection="content.areaIdList" item="item" separator="," open="(" close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
</if>
|
||||
|
||||
|
||||
</select>
|
||||
|
||||
<select id="selectSupplier" resultType="com.bonus.canteen.core.ims.vo.SupplierScoreVO">
|
||||
|
|
|
|||
Loading…
Reference in New Issue