修改bug

nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/suppliers/ISuppliersApi.java

@@ -21,7 +21,7 @@ public interface ISuppliersApi {
 
     SuppliersApplyEntity editSuppliers(SuppliersApplyEntity suppliersApplyEntity);
 
-    SuppliersApplyEntity getSupInfoByOpenId(String openId, String orgCode);
+    SuppliersApplyEntity getSupInfoByOpenId(String openId, String orgCode,String id);
 
     IPage<SuppliersOrgAllEntity> getSuppliersAuditLog(Integer pageNo, Integer pageSize, String openId);
 

nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/entity/NuBizSuppliersOrg.java

@@ -86,4 +86,37 @@ public class NuBizSuppliersOrg implements Serializable {
     @Excel(name = "审核机构", width = 15)
     @ApiModelProperty(value = "审核机构")
     private String applyOrg;
+
+    /**供应商名称*/
+    @Excel(name = "供应商名称", width = 15)
+    @ApiModelProperty(value = "供应商名称")
+    private java.lang.String suppliersName;
+    /**供应商性质 1代理商 2批发商 3制造商*/
+    @Excel(name = "供应商性质 1代理商 2批发商 3制造商", width = 15)
+    @ApiModelProperty(value = "供应商性质 1代理商 2批发商 3制造商")
+    private java.lang.String suppliersNature;
+    /**供应商地址*/
+    @Excel(name = "供应商地址", width = 15)
+    @ApiModelProperty(value = "供应商地址")
+    private java.lang.String suppliersAddress;
+    /**负责人*/
+    @Excel(name = "负责人", width = 15)
+    @ApiModelProperty(value = "负责人")
+    private java.lang.String personInCharge;
+    /**联系电话*/
+    @Excel(name = "联系电话", width = 15)
+    @ApiModelProperty(value = "联系电话")
+    private java.lang.String contactNumber;
+    /**开户行*/
+    @Excel(name = "开户行", width = 15)
+    @ApiModelProperty(value = "开户行")
+    private java.lang.String openingBank;
+    /**开户行账号*/
+    @Excel(name = "开户行账号", width = 15)
+    @ApiModelProperty(value = "开户行账号")
+    private java.lang.String openingBankNo;
+    /**资质照片*/
+    @Excel(name = "资质照片", width = 15)
+    @ApiModelProperty(value = "资质照片")
+    private java.lang.String imgPath;
 }

nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/mapper/xml/NuBizSuppliersApplyMapper.xml

@@ -55,6 +55,7 @@
 
     <select id="getSuppliersAuditLog" resultType="com.nu.entity.SuppliersOrgAllEntity">
         select
+        s.id as id,
         d.id as org_id,
         o.com_name as depart_name,
         d.org_code,
@@ -64,10 +65,12 @@
         o.org_address
         ,s.`status` as suppliers_status
         ,s.audit_content
+        ,s.create_time
         from sys_depart d
         left join nu_org_apply_info o on d.id = o.pk_id
         left join nu_biz_suppliers_org s on d.org_code = s.org_code
         where 1=1 and o.status = '2' and d.del_flag = '0'
         and s.open_id = #{openId}
+        order by s.create_time desc
     </select>
 </mapper>

nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/service/impl/NuBizSuppliersApplyServiceImpl.java

@@ -120,12 +120,20 @@ public class NuBizSuppliersApplyServiceImpl extends ServiceImpl<NuBizSuppliersAp
         if (list.size() > 0) {
             nuBizSuppliersOrg.setSuppliersId(list.get(0).getId());
         }
+        NuBizSuppliersApply nuBizSuppliersApply = list.get(0);
         nuBizSuppliersOrg.setStatus("1");
         nuBizSuppliersOrg.setIzHistory("N");
         nuBizSuppliersOrg.setApplyOrg(suppliersOrgEntity.getOrgCode());//审核机构
+        nuBizSuppliersOrg.setSuppliersName(nuBizSuppliersApply.getSuppliersName());
+        nuBizSuppliersOrg.setSuppliersNature(nuBizSuppliersApply.getSuppliersNature());
+        nuBizSuppliersOrg.setSuppliersAddress(nuBizSuppliersApply.getSuppliersAddress());
+        nuBizSuppliersOrg.setPersonInCharge(nuBizSuppliersApply.getPersonInCharge());
+        nuBizSuppliersOrg.setContactNumber(nuBizSuppliersApply.getContactNumber());
+        nuBizSuppliersOrg.setOpeningBank(nuBizSuppliersApply.getOpeningBank());
+        nuBizSuppliersOrg.setOpeningBankNo(nuBizSuppliersApply.getOpeningBankNo());
+        nuBizSuppliersOrg.setImgPath(nuBizSuppliersApply.getImgPath());
         nuBizSuppliersOrgMapper.insert(nuBizSuppliersOrg);
 
-        NuBizSuppliersApply nuBizSuppliersApply = list.get(0);
         SuppliersInfoMQDto suppliersInfoMQDto = new SuppliersInfoMQDto();
         suppliersInfoMQDto.setSuppliersName(nuBizSuppliersApply.getSuppliersName());
         suppliersInfoMQDto.setSuppliersNature(nuBizSuppliersApply.getSuppliersNature());
@@ -172,7 +180,14 @@ public class NuBizSuppliersApplyServiceImpl extends ServiceImpl<NuBizSuppliersAp
         addDto.setStatus("4");//变更申请
         addDto.setApplyOrg(suppliersApplyEntity.getOrgCode());
         addDto.setIzHistory("N");
-
+        addDto.setSuppliersName(suppliersApplyEntity.getSuppliersName());
+        addDto.setSuppliersNature(suppliersApplyEntity.getSuppliersNature());
+        addDto.setSuppliersAddress(suppliersApplyEntity.getSuppliersAddress());
+        addDto.setPersonInCharge(suppliersApplyEntity.getPersonInCharge());
+        addDto.setContactNumber(suppliersApplyEntity.getContactNumber());
+        addDto.setOpeningBank(suppliersApplyEntity.getOpeningBank());
+        addDto.setOpeningBankNo(suppliersApplyEntity.getOpeningBankNo());
+        addDto.setImgPath(suppliersApplyEntity.getImgPath());
         suppliersOrgService.save(addDto);
 
         //通知业务平台去审核
@@ -225,7 +240,7 @@ public class NuBizSuppliersApplyServiceImpl extends ServiceImpl<NuBizSuppliersAp
     }
 
     @Override
-    public SuppliersApplyEntity getSupInfoByOpenId(String openId, String orgCode) {
+    public SuppliersApplyEntity getSupInfoByOpenId(String openId, String orgCode,String id) {
         QueryWrapper<NuBizSuppliersApply> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("open_id", openId);
         queryWrapper.orderByDesc("create_time");
@@ -238,7 +253,24 @@ public class NuBizSuppliersApplyServiceImpl extends ServiceImpl<NuBizSuppliersAp
             qw.eq("iz_history", "N");
 //            qw.eq("org_code", orgCode);
             List<NuBizSuppliersOrg> soList = suppliersOrgService.list(qw);
-            if (!CollectionUtils.isEmpty(soList)) {
+            System.out.println("id-------------------------------------------------------"+id);
+            if(StringUtils.isNotEmpty(id) && !StringUtils.equals("undefined",id)){
+                NuBizSuppliersOrg NuBizSuppliersOrgA = suppliersOrgService.getById(id);
+                suppliersApplyEntity = new SuppliersApplyEntity();
+                suppliersApplyEntity.setSuppliersName(NuBizSuppliersOrgA.getSuppliersName());
+                suppliersApplyEntity.setSuppliersNature(NuBizSuppliersOrgA.getSuppliersNature());
+                suppliersApplyEntity.setSuppliersAddress(NuBizSuppliersOrgA.getSuppliersAddress());
+                suppliersApplyEntity.setPersonInCharge(NuBizSuppliersOrgA.getPersonInCharge());
+                suppliersApplyEntity.setContactNumber(NuBizSuppliersOrgA.getContactNumber());
+                suppliersApplyEntity.setOpeningBank(NuBizSuppliersOrgA.getOpeningBank());
+                suppliersApplyEntity.setOpeningBankNo(NuBizSuppliersOrgA.getOpeningBankNo());
+                suppliersApplyEntity.setImgPath(NuBizSuppliersOrgA.getImgPath());
+                suppliersApplyEntity.setSuppliersStatus(NuBizSuppliersOrgA.getStatus());
+                suppliersApplyEntity.setAuditContent(NuBizSuppliersOrgA.getAuditContent());
+                if("4".equals(NuBizSuppliersOrgA.getStatus())){
+                    suppliersApplyEntity.setIzModify(true);
+                }
+            }else if (!CollectionUtils.isEmpty(soList)) {
                 for (int i = 0; i < soList.size(); i++) {
                     NuBizSuppliersOrg so = soList.get(i);
                     if (so.getOrgCode().equals(orgCode)) {
@@ -251,6 +283,7 @@ public class NuBizSuppliersApplyServiceImpl extends ServiceImpl<NuBizSuppliersAp
                     }
                 }
             }
+
             return suppliersApplyEntity;
         }
         return null;

nursing-unit-api/src/main/java/com/nu/modules/wechat/suppliers/SuppliersApi.java

@@ -126,8 +126,8 @@ public class SuppliersApi {
      */
     @GetMapping(value = "/getSupInfoByOpenId")
     public Result<SuppliersApplyEntity> getSupInfoByOpenId(
-            @RequestParam(value = "openId") String openId, @RequestParam(value = "orgCode") String orgCode) {
+            @RequestParam(value = "openId") String openId, @RequestParam(value = "orgCode") String orgCode, @RequestParam(value = "id",required = false) String id) {
-        SuppliersApplyEntity result = suppliersApi.getSupInfoByOpenId(openId, orgCode);
+        SuppliersApplyEntity result = suppliersApi.getSupInfoByOpenId(openId, orgCode,id);
         return Result.OK(result);
     }
 

nursing-unit-common/src/main/java/com/nu/entity/SuppliersOrgAllEntity.java

@@ -36,5 +36,7 @@ public class SuppliersOrgAllEntity implements Serializable {
     private String serverUrl;
 
     private String auditContent;
+    private String id;
+    private String createTime;
 
 }