hzya
/
kangarooDataCenterV3
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dongj' into dongj

This commit is contained in:
yuqh 2024-11-05 14:29:40 +08:00
parent 2400d08a93 4d73583183
commit fa3202304b
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
service/src/main/java/com/hzya/frame/u8c/Encapsulation/entity/EncapsulationEntity.xml
View File

@ -12,12 +12,11 @@
WHERE
h.cgeneralhid in (
SELECT cgeneralhid FROM ic_general_b WHERE vfirstbillcode = #{code}
<if test="type != null and type != ''"> and csourcetype = #{type} </if>
<if test="type != null and type != ''"> and csourcetype = #{type} </if> and dr = '0'
)
<if test="cbilltypecode != null and cbilltypecode != ''"> and h.cbilltypecode = #{cbilltypecode} </if>
group by h.vbillcode,a.unitcode
</select>
</mapper>

1
service/src/main/java/com/hzya/frame/u8c/Encapsulation/service/impl/EncapsulationImpl.java
View File

@ -9,7 +9,6 @@ import com.hzya.frame.sysnew.application.entity.SysApplicationEntity;
import com.hzya.frame.sysnew.application.entity.SysExtensionApiEntity;
import com.hzya.frame.u8c.Encapsulation.dao.IEncapsulationDao;
import com.hzya.frame.u8c.Encapsulation.entity.EncapsulationEntity;
import com.hzya.frame.u8c.Encapsulation.service.IEncapsulationService;
import org.apache.http.HttpEntity;
import org.apache.http.client.config.RequestConfig;
import org.apache.http.client.methods.CloseableHttpResponse;