UDI
/
udi-spms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 代码优化

Browse Source
dev_drug_dm
chenhc 1 month ago
parent 5d0c331d80
commit 297983ced5
16 changed files with 20 additions and 64 deletions
Show Stats Download Patch File Download Diff File

7
src/main/java/com/glxp/api/controller/thrsys/ThrCorpImportLogController.java
Unescape Escape View File

@ -1,5 +1,7 @@
package com.glxp.api.controller.thrsys;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum;
@ -72,10 +74,13 @@ public class ThrCorpImportLogController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
String id = deleteRequest.getId();
if (StrUtil.isEmpty(id)){
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
}
FilterThrCorpImportLogRequest filterInCodeLogRequest = new FilterThrCorpImportLogRequest();
filterInCodeLogRequest.setId(Integer.parseInt(id));
List<ThrCorpImportLogEntity> thrCorpImportLogEntities = thrCorpImportLogService.filterThrCorpImportLog(filterInCodeLogRequest);
if (thrCorpImportLogEntities != null && thrCorpImportLogEntities.size() > 0) {
if (CollUtil.isNotEmpty(thrCorpImportLogEntities)) {
ThrCorpImportLogEntity thrCorpImportLogEntity = thrCorpImportLogEntities.get(0);
thrCorpImportLogService.deleteById(thrCorpImportLogEntity.getId() + "");
thrCorpImportDetailService.deleteByGenkey(thrCorpImportLogEntity.getGenKey());

9
src/main/java/com/glxp/api/controller/thrsys/ThrCorpsController.java
Unescape Escape View File

@ -218,16 +218,11 @@ public class ThrCorpsController {
ThrCorpsResponse thrCorpEntity = new ThrCorpsResponse();
BeanUtils.copyProperties(item, thrCorpEntity);
ThrUnitMaintainResponse thrUnitMaintainResponse = thrCorpService.selectByThirdId(item.getUnitId(), thrUnitMaintainFilterRequest.getThirdSys());
if (thrUnitMaintainResponse != null) {
thrCorpEntity.setChecked(true);
} else {
thrCorpEntity.setChecked(false);
}
thrCorpEntity.setChecked(thrUnitMaintainResponse != null);
thrCorpEntity.setId(item.getUnitId());
return thrCorpEntity;
}).collect(Collectors.toList());
PageInfo<ThrCorpsResponse> pageInfo;
pageInfo = new PageInfo<>(thrCorpEntities);
PageInfo<ThrCorpsResponse> pageInfo = new PageInfo<>(thrCorpEntities);
PageSimpleResponse<ThrCorpsResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(thrCorpEntityList);

3
src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsExportLogController.java
Unescape Escape View File

@ -178,8 +178,7 @@ public class ThrInvProductsExportLogController {
erpInvProductResponse.setName(item.getInventoryName());
return erpInvProductResponse;
}).collect(Collectors.toList());
PageInfo<ThrInvProductResponse> pageInfo;
pageInfo = new PageInfo<>(erpInvProductResponseList);
PageInfo<ThrInvProductResponse> pageInfo = new PageInfo<>(erpInvProductResponseList);
PageSimpleResponse<ThrInvProductResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(erpInvProductResponseList);

2
src/main/java/com/glxp/api/dao/auth/SysUserRoleMapper.java
Unescape Escape View File

@ -15,8 +15,6 @@ public interface SysUserRoleMapper {
int insertBatch(@Param("sysUserRoles") List<SysUserRole> sysUserRoles);
int insert(SysUserRole sysUserRole);
List<SysUserRole> selectUserRoleList(Long roleId);
}

3
src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java
Unescape Escape View File

@ -14,11 +14,8 @@ import java.util.List;
public interface BasicCorpDao extends BaseMapperPlus<BasicCorpDao, BasicCorpEntity, BasicCorpEntity> {
List<BasicCorpEntity> filterList(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest);
boolean insertThrUnitMaintainignore(ThrUnitMaintainResponse thrUnitMaintainResponse);
// int insertEntity(BasicCorpEntity basicUnitMaintainEntity);
int updateEntityById(BasicCorpEntity basicUnitMaintainSaveRequest);
BasicCorpEntity selectByThirdId(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest);

1
src/main/java/com/glxp/api/dao/basic/BasicProductsImportDetailDao.java
Unescape Escape View File

@ -17,7 +17,6 @@ public interface BasicProductsImportDetailDao {
boolean updateUdiInfoImport(BasicProductsImportDetailEntity udiInfoImportEntity);
boolean deleteById(@Param("id") String id);
boolean deleteByGenkey(@Param("genKey") String genKey);

1
src/main/java/com/glxp/api/dao/basic/EntrustReceDao.java
Unescape Escape View File

@ -21,7 +21,6 @@ public interface EntrustReceDao extends BaseMapperPlus<EntrustReceDao, EntrustRe
EntrustReceEntity findByUnique(@Param("action") String action, @Param("entrustUser") Long entrustUser);
boolean deleteById(String id);
boolean deleteAll();

1
src/main/java/com/glxp/api/dao/basic/UdiCompanyDao.java
Unescape Escape View File

@ -19,7 +19,6 @@ public interface UdiCompanyDao {
boolean deleteAll(@Param("ids") List<String> ids);
List<UdiCompanyEntity> syncDlCompany(UdiCompanyRequest udiCompanyRequest);
}

1
src/main/java/com/glxp/api/dao/basic/UdiProductDao.java
Unescape Escape View File

@ -22,7 +22,6 @@ public interface UdiProductDao extends BaseMapperPlus<UdiProductDao, UdiProductE
List<UdiProductEntity> findByOriginUuid(@Param("originUuid") String originUuid);
UdiProductEntity findById(@Param("id") String id);
boolean insertUdiInfo(UdiProductEntity udiProductEntity);

5
src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java
Unescape Escape View File

@ -25,23 +25,18 @@ public interface UdiRelevanceDao extends BaseMapperPlus<UdiRelevanceDao, UdiRele
List<UdiRelevanceResponse> filterUdiGp(FilterUdiRelRequest filterUdiRelRequest);
// UdiRelevanceResponse selectUdiByUUid
List<UdiRelevanceEntity> selectByUuid(@Param("uuid") String uuid);
List<UdiRelevanceResponse> contrastJoinSelect(FilterUdiRelRequest filterUdiRelRequest);
UdiRelevanceEntity selectById(@Param("id") Long id);
UdiRelevanceEntity selectByThirdId(FilterUdiRelRequest filterUdiRelRequest);
List<UdiRelevanceEntity> filterEntity(FilterUdiRelRequest filterUdiRelRequest);
boolean insertUdiRelevance(UdiRelevanceEntity udiRelevanceEntity);
boolean updateUdiRelevance(UdiRelevanceEntity udiRelevanceEntity);
boolean deleteById(@Param("id") String id);

3
src/main/java/com/glxp/api/dao/basic/UdiRlSupDao.java
Unescape Escape View File

@ -20,21 +20,18 @@ public interface UdiRlSupDao extends BaseMapperPlus<UdiRlSupDao, UdiRlSupEntity,
UdiRlSupEntity findCompanyProductRelevance(String CustomerId);
UdiRlSupEntity findCompanyProductRelevanceByUdiRlIdFk(@Param("udiRlIdFk") String udiRlIdFk, @Param("customerId") String customerId);
UdiRlSupEntity findCompanyProductRelevanceByProductUuid(UdiRlSupEntity udiRlSupEntity);
List<UdiRlSupEntity> getCompanyProductRelevance(FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest);
boolean insertCompanyProductRelevance(UdiRlSupEntity companyCertEntity);
boolean importCompanyProductRelevance(UdiRlSupEntity udiRlSupEntity);
boolean deleteById(String id);
/**
* 根据耗材ID查询供应商ID列表
*

2
src/main/java/com/glxp/api/dao/inout/IoCodeDao.java
Unescape Escape View File

@ -25,6 +25,7 @@ public interface IoCodeDao extends BaseMapperPlus<IoCodeDao, IoCodeEntity, IoCod
* @return
*/
List<IoCodeResponse> filterList(FilterCodeRequest filterCodeRequest);
List<IoCodeResponse> filterDrugList(FilterCodeRequest filterCodeRequest);
/**
@ -34,6 +35,5 @@ public interface IoCodeDao extends BaseMapperPlus<IoCodeDao, IoCodeEntity, IoCod
*/
List<IoCodeResponse> findByCodeSumReCount(List<String> codes);
List<YcFileCodeUploadVo> filterListexcelExport(FilterCodeRequest filterCodeRequest);
}

25
src/main/java/com/glxp/api/httpClient/serviceClient/impl/ErpInvClientImpl.java
Unescape Escape View File

@ -8,6 +8,7 @@ import com.glxp.api.httpClient.utils.HttpOkClient;
import com.glxp.api.req.thrsys.ThrOnhandRequest;
import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.res.thrsys.ThrInvProductResponse;
import com.glxp.api.util.StringUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@ -23,30 +24,6 @@ public class ErpInvClientImpl implements ErpInvClient {
@Override
public BaseResponse<PageSimpleResponse<ThrInvProductResponse>> getInvPrdoductResponse(ThrOnhandRequest onhandRequest, String url) {
Map<String, Object> paramMap = new HashMap<>(16);
if (onhandRequest.getBatchNo() != null && !onhandRequest.getBatchNo().equals(""))
paramMap.put("batchNo", onhandRequest.getBatchNo());
if (onhandRequest.getWarehouseCode() != null && !onhandRequest.getWarehouseCode().equals(""))
paramMap.put("warehouseCode", onhandRequest.getWarehouseCode());
if (onhandRequest.getInventoryCode() != null && !onhandRequest.getInventoryCode().equals(""))
paramMap.put("inventoryCode", onhandRequest.getInventoryCode());
if (onhandRequest.getInventoryName() != null && !onhandRequest.getInventoryName().equals(""))
paramMap.put("inventoryName", onhandRequest.getInventoryName());
if (onhandRequest.getSpec() != null && !onhandRequest.getSpec().equals(""))
paramMap.put("spec", onhandRequest.getSpec());
if (onhandRequest.getRegisterCertNo() != null && !onhandRequest.getRegisterCertNo().equals(""))
paramMap.put("registerCertNo", onhandRequest.getRegisterCertNo());
if (onhandRequest.getManufactory() != null && !onhandRequest.getManufactory().equals(""))
paramMap.put("manufactory", onhandRequest.getManufactory());
if (onhandRequest.getFilterCount() != null && !onhandRequest.getFilterCount().equals(""))
paramMap.put("filterCount", onhandRequest.getFilterCount());
if (onhandRequest.getPage() != null)
paramMap.put("page", onhandRequest.getPage());
if (onhandRequest.getLimit() != null)
paramMap.put("limit", onhandRequest.getLimit());
String response = httpOkClient.uCloudPost(url, onhandRequest);
try {
BaseResponse<PageSimpleResponse<ThrInvProductResponse>> onHandsResponse =

4
src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java
Unescape Escape View File

@ -97,7 +97,6 @@ public class SpsSyncDownloadService {
BasicExportService basicExportService;
@Resource
BasicExportTimeService basicExportTimeService;
@Resource
IoOrderInvoiceService orderInvoiceService;
@ -135,9 +134,8 @@ public class SpsSyncDownloadService {
orderStatusEntity.setScheduleType(BasicProcessStatus.SCHEDULE_NORMAL);
if (lastUpdateTime != null) {
String fileFullPath = null;
try {
fileFullPath = writeFile(filePath, BasicProcessStatus.NEW_ALL_BUS_ORDER, JSONUtil.toJsonStr(baseResponse.getData()));
String fileFullPath = writeFile(filePath, BasicProcessStatus.NEW_ALL_BUS_ORDER, JSONUtil.toJsonStr(baseResponse.getData()));
orderStatusEntity.setCacheFilePath(fileFullPath);
orderStatusEntity.setRemark(baseResponse.getData().getSyncRemark());
} catch (IOException e) {

15
src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml
Unescape Escape View File

@ -6,8 +6,8 @@
resultType="com.glxp.api.entity.auth.AuthAdmin">
SELECT auth_user.*, auth_dept.name deptName, auth_warehouse.name warehouseName
FROM auth_user
left join auth_dept on auth_user.locDeptCode = auth_dept.code
LEFT JOIN auth_warehouse on auth_user.locInvCode = auth_warehouse.code
left join auth_dept on auth_user.locDeptCode = auth_dept.code
LEFT JOIN auth_warehouse on auth_user.locInvCode = auth_warehouse.code
<where>
<if test="ids != null and ids.size > 0">
AND id IN
@ -30,8 +30,8 @@
<if test="lastUpdateTime != null and lastUpdateTime != ''">
<![CDATA[
and DATE_FORMAT(lastModifyTime
, '%Y-%m-%d %H:%i:%S') >= DATE_FORMAT(#{lastUpdateTime}
, '%Y-%m-%d %H:%i:%S')
, '%Y-%m-%d %H:%i:%S') >= DATE_FORMAT(#{lastUpdateTime}
, '%Y-%m-%d %H:%i:%S')
]]>
</if>
<if test="deptCode != null and deptCode != ''">
@ -41,8 +41,7 @@
AND auth_user.CustomerId = #{CustomerId}
</if>
</where>
ORDER BY id
DESC
ORDER BY id DESC
</select>
<select id="findByUserName" parameterType="hashmap" resultType="com.glxp.api.entity.auth.AuthAdmin">
@ -168,9 +167,9 @@
from auth_user
left join auth_dept_user on auth_user.id = auth_dept_user.userId
<where>
userFlag != 0
userFlag
<if test="deptId != null and '' != deptId">
AND auth_dept_user.deptId = #{deptId}
#{deptId}
</if>
<if test="userIds != null and userIds.size() != 0">
and auth_user.id not in

2
src/main/resources/mybatis/mapper/basic/BasicProductSetDao.xml
Unescape Escape View File

@ -11,7 +11,7 @@
FROM basic_product_set
<where>
<if test="parmName != '' and parmName!=null">
and udiRlIdFk = #{udiRlIdFk}
and parmName = #{parmName}
</if>
<if test="enable != null ">
and enable = #{enable}

Write Preview
Loading…
Cancel
Save