[解决bug]

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/a4endpoint/MedicineDevicePrintMessageEndpoint.java

@@ -51,12 +51,12 @@ public class MedicineDevicePrintMessageEndpoint extends EnvelopRestEndpoint {
    @GetMapping(value = "/selectByCondition")
    @ApiOperation(value = "根据设备名称/设备编码查询设备打印列表")
    public Envelop selectByCondition(
            @ApiParam(name = "condition", value = "设备名称/设备编码", required = true)
            @ApiParam(name = "condition", value = "设备名称/设备编码", required = false)
            @RequestParam(value = "condition") String condition,
            @ApiParam(name = "page", value = "page", required = false)
            @RequestParam(value = "page", required = false)Integer page,
            @RequestParam(value = "page", required = true)Integer page,
            @ApiParam(name = "size", value = "size", required = false)
            @RequestParam(value = "size", required = false)Integer size) throws Exception {
            @RequestParam(value = "size", required = true)Integer size) throws Exception {
        return success(printMessageService.selectByCondition(condition,page,size));
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicineStockOutService.java

@@ -383,12 +383,12 @@ public class MedicineStockOutService extends BaseJpaService<Mediicinestockout, M
            conditionSql += " and t.receive_state = '" + receiveState + "'";
        }
        if (!StringUtils.isEmpty(replenishEr)){
            conditionSql += " AND CONCAT(IFNULL(bu.`name`,''),IFNULL(bu.`mobile`,'') LIKE '%" + replenishEr + "%'";
            conditionSql += " AND CONCAT(IFNULL(bu.name,''),IFNULL(bu.mobile,'') LIKE '%" + replenishEr + "%'";
        }
        if (!StringUtils.isEmpty(docNum)){
            conditionSql += " and t.doc_num like '%" + docNum + "%'";
        }
        sql = sql + conditionSql;
        sql = sql + conditionSql +" order by t.receive_state asc,t.doc_time desc ";
        List<Map<String,Object>> list=null;
        list = hibenateUtils.createSQLQuery(sql,page,size);

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicineStockUpService.java

@@ -344,7 +344,7 @@ public class MedicineStockUpService extends BaseJpaService<Mediicinestockup, Med
        if (!StringUtils.isEmpty(state)){
            conditionSql += " and t.state = '" + state + "'";
        }
        sql = sql + conditionSql +" order by t.state asc,t.doc_time desc  ";
        sql = sql + conditionSql +" order by t.state desc,t.doc_time desc  ";
        List<Map<String,Object>> list=null;
        list = hibenateUtils.createSQLQuery(sql,page,size);

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicineUserService.java

@@ -6,6 +6,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.base.dao.a2dao.MediicineDeviceDao;
import com.yihu.jw.base.dao.a2dao.MediicineDeviceUserDao;
import com.yihu.jw.base.dao.a2dao.MediicineUserDao;
import com.yihu.jw.base.dao.equipment.WlyyUserAreaDao;
import com.yihu.jw.base.dao.role.RoleDao;
import com.yihu.jw.base.dao.user.UserDao;
import com.yihu.jw.base.util.ConstantUtils;
@@ -15,6 +16,7 @@ import com.yihu.jw.entity.a1entity.Mediicinedevice;
import com.yihu.jw.entity.a1entity.Mediicineuser;
import com.yihu.jw.entity.base.role.RoleDO;
import com.yihu.jw.entity.base.user.UserDO;
import com.yihu.jw.entity.equipment.WlyyUserAreaDO;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -53,6 +55,9 @@ public class MedicineUserService extends BaseJpaService<Mediicineuser, Mediicine
    @Autowired
    private HibenateUtils hibenateUtils;
    @Autowired
    private WlyyUserAreaDao userAreaDao;
    /**
     * 分页查询补货员信息
@@ -161,7 +166,7 @@ public class MedicineUserService extends BaseJpaService<Mediicineuser, Mediicine
                "\tAND b.enabled = 1\n" +
                "\tAND b.locked = 0\n";
        if (!StringUtils.isEmpty(content)){
            conditionSql += "\tAND CONCAT(IFNULL(b.`mobile`,''),IFNULL(b.`name`,'')) like '%"+ content +"%'";
            conditionSql += "\tAND CONCAT(IFNULL(b.mobile,''),IFNULL(b.name,'')) like '%"+ content +"%'";
        }
        sql = sql + conditionSql;
@@ -176,6 +181,8 @@ public class MedicineUserService extends BaseJpaService<Mediicineuser, Mediicine
                    "  1=1 and t.del = 1 and t.user_id = '" + stringObjectMap.get("id").toString() + "'";
            stringObjectMap.put("allocatedDevice", jdbcTemplate.queryForObject(countSql, Integer.class));
            stringObjectMap.put("deviceQty", deviceDao.countAll());
            List<WlyyUserAreaDO> areaDOList =userAreaDao.findAllByUserId(stringObjectMap.get("id").toString());
            stringObjectMap.put("areaList",areaDOList);
        }
        String countSql = " select " +
                "     COUNT(DISTINCT (b.id)) as count " +

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicinedevicePrintMessageService.java

@@ -7,6 +7,7 @@ import com.yihu.jw.entity.a1entity.*;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -71,8 +72,11 @@ public class MedicinedevicePrintMessageService extends BaseJpaService<Medicinede
     * @return
     */
    public List<Map<String,Object>> selectByCondition(String condition,Integer page,Integer size){
        String sql = " SELECT d.equ_name as equName,d.equ_num as equNum,pm.picture,pm.remark_end as remarkEnd,pm.id as id from  t_mediicine_device_print_message pm LEFT JOIN t_mediicine_device d ON pm.device_id = d.id " +
                "where (d.equ_name LIKE '%"+condition+"%' OR d.equ_num LIKE '%"+condition+"%') order by create_time desc ";
        String sql = " SELECT d.equ_name as equName,d.equ_num as equNum,pm.picture,pm.remark_end as remarkEnd,pm.id as id from  t_mediicine_device_print_message pm LEFT JOIN t_mediicine_device d ON pm.device_id = d.id ";
        if (StringUtils.isNoneBlank(condition)){
            sql += " where (d.equ_name LIKE '%"+condition+"%' OR d.equ_num LIKE '%"+condition+"%')";
        }
        sql+=" order by pm.create_time desc ";
        List<Map<String,Object>> mapList = hibenateUtils.createSQLQuery(sql,page,size);
        return mapList;
    }

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicinedeviceService.java

@@ -459,6 +459,11 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
            result.put("response", ConstantUtils.FAIL);
            return result.toJSONString();
        }
        if(networkStatus.equalsIgnoreCase("0")){
            mediicinedevice.setSaleStatus("2");
        }else {
            mediicinedevice.setSaleStatus("1");
        }
        mediicinedevice.setNetworkStatus(networkStatus);
        this.save(mediicinedevice);
        result.put("response",ConstantUtils.SUCCESS);