xiangq

src/main/java/com/chinaitop/depot/sqr/mapper/BizSqrEnterpriseApplyMapper.java

@@ -31,6 +31,8 @@ public interface BizSqrEnterpriseApplyMapper {
 
     BizSqrEnterpriseApplyVO findById(Map map);
 
+    BizSqrEnterpriseApplyVO findById1(Map map);
+
     int insert(BizSqrEnterpriseApply bizSqrEnterpriseApply);
 
     int selectRequestfindByApplyId(String id);

src/main/java/com/chinaitop/depot/sqr/mapper/BizSqrEnterpriseApplyMapper.xml

@@ -123,6 +123,25 @@
 
     </select>
 
+    <select id="findById1" resultType="Map" resultMap="BaseResultMap">
+        SELECT
+        bgqa.id, A.dwmc,A.id unitInfoId, A.dwdm,A.fddbr,A.dwlx,A.zcdz,A.cfs,A.ygs,A.DICT_LABEL,bgqa.apply_status,bgqa.apply_type,
+        bse.certified_storekeeper_count ,bse.certified_inspector_count ,bse.warehouse_facility_situation ,
+        bse.full_time_staff_count ,bgqa.storage_expire_time ,bgqa.attachment attachment,bgqa.sqr_enterprise_id
+        FROM
+        province_all.biz_sqr_enterprise_apply bgqa
+        left join province_all.biz_sqr_enterprise  bse on bgqa.sqr_enterprise_id =bse.id
+        left join(select bui.id,bui.dwmc,bui.dwdm,bui.fddbr,bui.dwlx,bui.zcdz,bui.cfs,bui.ygs,dict.DICT_LABEL  from province_all.biz_unit_info bui left join province_all.dev_dict dict on bui.dwlx = dict.id
+        <if test="unitInfoId != null and unitInfoId != ''">
+            where bui.id =#{unitInfoId,jdbcType=VARCHAR}
+        </if>
+
+        )A  on bgqa.unit_info_id = A.id
+        where bgqa.id=#{id,jdbcType=INTEGER} and bgqa.apply_type=#{applyType,jdbcType=INTEGER}
+
+    </select>
+
+
     <insert id="insert" keyProperty="id" useGeneratedKeys="true"  parameterType="com.chinaitop.depot.sqr.model.BizSqrEnterpriseApply">
         insert into province_all.biz_sqr_enterprise_apply (id,unit_info_id,apply_type,
                                               apply_status,storage_expire_time,sqr_enterprise_id,

src/main/java/com/chinaitop/depot/sqr/service/impl/BizSqrEnterpriseApplyServiceImpl.java

@@ -79,10 +79,18 @@ public class BizSqrEnterpriseApplyServiceImpl implements BizSqrEnterpriseApplySe
     @Override
     public BizSqrEnterpriseApplyVO findById(Integer applyType,String unitInfoId,Integer id){
         Map map =new HashMap<>();
-        map.put("id",id);
-        map.put("applyType",applyType);
-        map.put("unitInfoId",unitInfoId);
-        return bizSqrEnterpriseApplyMapper.findById(map);
+        if(applyType==1){
+            map.put("id",id);
+            map.put("applyType",applyType);
+            map.put("unitInfoId",unitInfoId);
+            return bizSqrEnterpriseApplyMapper.findById(map);
+        }else{
+            map.put("id",id);
+            map.put("applyType",applyType);
+            map.put("unitInfoId",unitInfoId);
+            return bizSqrEnterpriseApplyMapper.findById1(map);
+        }
+
     }
 
     @Override
@@ -197,6 +205,7 @@ public class BizSqrEnterpriseApplyServiceImpl implements BizSqrEnterpriseApplySe
             bizSqrEnterpriseApply.setUpdateTime(new Date());
             return bizSqrEnterpriseApplyMapper.insert(bizSqrEnterpriseApply);
         }
+
         bizSqrEnterpriseApply.setCreateTime(new Date());
         bizSqrEnterpriseApply.setUpdateTime(new Date());
         return bizSqrEnterpriseApplyMapper.insert(bizSqrEnterpriseApply);