优化代码

java110-bean/src/main/java/com/java110/dto/invoiceApply/InvoiceApplyDto.java

@@ -1,6 +1,8 @@
 package com.java110.dto.invoiceApply;
 
 import com.java110.dto.PageDto;
+import com.java110.dto.ownerInvoice.OwnerInvoiceDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -12,19 +14,19 @@ import java.util.Date;
  * @Version 1.0
  * add by wuxw 2019/4/24
  **/
-public class InvoiceApplyDto extends PageDto implements Serializable {
+public class InvoiceApplyDto extends OwnerInvoiceDto implements Serializable {
 
     private String applyId;
-private String oiId;
-private String createUserId;
-private String ownerName;
-private String invoiceType;
-private String applyTel;
-private String invoiceAmount;
-private String createUserName;
-private String remark;
-private String state;
-private String communityId;
+    private String oiId;
+    private String createUserId;
+    private String ownerName;
+    private String invoiceType;
+    private String applyTel;
+    private String invoiceAmount;
+    private String createUserName;
+    private String remark;
+    private String state;
+    private String communityId;
 
 
     private Date createTime;
@@ -35,67 +37,88 @@ private String communityId;
     public String getApplyId() {
         return applyId;
     }
-public void setApplyId(String applyId) {
+
+    public void setApplyId(String applyId) {
         this.applyId = applyId;
     }
-public String getOiId() {
+
+    public String getOiId() {
         return oiId;
     }
-public void setOiId(String oiId) {
+
+    public void setOiId(String oiId) {
         this.oiId = oiId;
     }
-public String getCreateUserId() {
+
+    public String getCreateUserId() {
         return createUserId;
     }
-public void setCreateUserId(String createUserId) {
+
+    public void setCreateUserId(String createUserId) {
         this.createUserId = createUserId;
     }
-public String getOwnerName() {
+
+    public String getOwnerName() {
         return ownerName;
     }
-public void setOwnerName(String ownerName) {
+
+    public void setOwnerName(String ownerName) {
         this.ownerName = ownerName;
     }
-public String getInvoiceType() {
+
+    public String getInvoiceType() {
         return invoiceType;
     }
-public void setInvoiceType(String invoiceType) {
+
+    public void setInvoiceType(String invoiceType) {
         this.invoiceType = invoiceType;
     }
-public String getApplyTel() {
+
+    public String getApplyTel() {
         return applyTel;
     }
-public void setApplyTel(String applyTel) {
+
+    public void setApplyTel(String applyTel) {
         this.applyTel = applyTel;
     }
-public String getInvoiceAmount() {
+
+    public String getInvoiceAmount() {
         return invoiceAmount;
     }
-public void setInvoiceAmount(String invoiceAmount) {
+
+    public void setInvoiceAmount(String invoiceAmount) {
         this.invoiceAmount = invoiceAmount;
     }
-public String getCreateUserName() {
+
+    public String getCreateUserName() {
         return createUserName;
     }
-public void setCreateUserName(String createUserName) {
+
+    public void setCreateUserName(String createUserName) {
         this.createUserName = createUserName;
     }
-public String getRemark() {
+
+    public String getRemark() {
         return remark;
     }
-public void setRemark(String remark) {
+
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-public String getState() {
+
+    public String getState() {
         return state;
     }
-public void setState(String state) {
+
+    public void setState(String state) {
         this.state = state;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
 

java110-db/src/main/resources/mapper/acct/InvoiceApplyV1ServiceDaoImplMapper.xml

@@ -21,8 +21,9 @@
         createUserId,t.owner_name,t.owner_name ownerName,t.invoice_type,t.invoice_type
         invoiceType,t.apply_tel,t.apply_tel applyTel,t.invoice_amount,t.invoice_amount
         invoiceAmount,t.create_user_name,t.create_user_name createUserName,t.remark,t.status_cd,t.status_cd
-        statusCd,t.state,t.community_id,t.community_id communityId
+        statusCd,t.state,t.community_id,t.community_id communityId,oi.invoice_name invoiceName,oi.invoice_num invoiceNum,oi.invoice_address invoiceAddress
         from invoice_apply t
+        left join owner_invoice oi on t.oi_id = oi.oi_id
         where 1 =1
         <if test="applyId !=null and applyId != ''">
             and t.apply_id= #{applyId}

service-acct/src/main/java/com/java110/acct/cmd/invoiceApply/DeleteInvoiceApplyCmd.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.java110.acct.cmd.invoiceApply;
+package com.java110.acct.cmd.invoice;
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
@@ -21,7 +21,6 @@ import com.java110.core.annotation.Java110Transactional;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
-import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.intf.acct.IInvoiceApplyV1InnerServiceSMO;
 import com.java110.po.invoiceApply.InvoiceApplyPo;
 import com.java110.utils.exception.CmdException;
@@ -42,7 +41,7 @@ import org.slf4j.LoggerFactory;
  * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
  * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
  */
-@Java110Cmd(serviceCode = "invoiceApply.deleteInvoiceApply")
+@Java110Cmd(serviceCode = "invoice.deleteInvoiceApply")
 public class DeleteInvoiceApplyCmd extends Cmd {
     private static Logger logger = LoggerFactory.getLogger(DeleteInvoiceApplyCmd.class);
 

service-acct/src/main/java/com/java110/acct/cmd/invoiceApplyItem/DeleteInvoiceApplyItemCmd.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.java110.acct.cmd.invoiceApplyItem;
+package com.java110.acct.cmd.invoice;
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
@@ -21,7 +21,6 @@ import com.java110.core.annotation.Java110Transactional;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
-import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.intf.acct.IInvoiceApplyItemV1InnerServiceSMO;
 import com.java110.po.invoiceApplyItem.InvoiceApplyItemPo;
 import com.java110.utils.exception.CmdException;
@@ -42,7 +41,7 @@ import org.slf4j.LoggerFactory;
  * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
  * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
  */
-@Java110Cmd(serviceCode = "invoiceApplyItem.deleteInvoiceApplyItem")
+@Java110Cmd(serviceCode = "invoice.deleteInvoiceApplyItem")
 public class DeleteInvoiceApplyItemCmd extends Cmd {
     private static Logger logger = LoggerFactory.getLogger(DeleteInvoiceApplyItemCmd.class);
 

service-acct/src/main/java/com/java110/acct/cmd/invoiceApply/ListInvoiceApplyCmd.java

@@ -13,17 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.java110.acct.cmd.invoiceApply;
+package com.java110.acct.cmd.invoice;
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
-import com.java110.core.annotation.Java110Transactional;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
-import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.intf.acct.IInvoiceApplyV1InnerServiceSMO;
-import com.java110.po.invoiceApply.InvoiceApplyPo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
@@ -48,7 +45,7 @@ import org.slf4j.LoggerFactory;
  * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
  * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
  */
-@Java110Cmd(serviceCode = "invoiceApply.listInvoiceApply")
+@Java110Cmd(serviceCode = "invoice.listInvoiceApply")
 public class ListInvoiceApplyCmd extends Cmd {
 
   private static Logger logger = LoggerFactory.getLogger(ListInvoiceApplyCmd.class);

service-acct/src/main/java/com/java110/acct/cmd/invoiceApplyItem/ListInvoiceApplyItemCmd.java

@@ -13,17 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.java110.acct.cmd.invoiceApplyItem;
+package com.java110.acct.cmd.invoice;
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
-import com.java110.core.annotation.Java110Transactional;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
-import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.intf.acct.IInvoiceApplyItemV1InnerServiceSMO;
-import com.java110.po.invoiceApplyItem.InvoiceApplyItemPo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
@@ -48,7 +45,7 @@ import org.slf4j.LoggerFactory;
  * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
  * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
  */
-@Java110Cmd(serviceCode = "invoiceApplyItem.listInvoiceApplyItem")
+@Java110Cmd(serviceCode = "invoice.listInvoiceApplyItem")
 public class ListInvoiceApplyItemCmd extends Cmd {
 
   private static Logger logger = LoggerFactory.getLogger(ListInvoiceApplyItemCmd.class);

service-acct/src/main/java/com/java110/acct/cmd/invoiceApply/SaveInvoiceApplyCmd.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.java110.acct.cmd.invoiceApply;
+package com.java110.acct.cmd.invoice;
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
@@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory;
  * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
  * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
  */
-@Java110Cmd(serviceCode = "invoiceApply.saveInvoiceApply")
+@Java110Cmd(serviceCode = "invoice.saveInvoiceApply")
 public class SaveInvoiceApplyCmd extends Cmd {
 
     private static Logger logger = LoggerFactory.getLogger(SaveInvoiceApplyCmd.class);

service-acct/src/main/java/com/java110/acct/cmd/invoiceApplyItem/SaveInvoiceApplyItemCmd.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.java110.acct.cmd.invoiceApplyItem;
+package com.java110.acct.cmd.invoice;
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
@@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory;
  * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
  * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
  */
-@Java110Cmd(serviceCode = "invoiceApplyItem.saveInvoiceApplyItem")
+@Java110Cmd(serviceCode = "invoice.saveInvoiceApplyItem")
 public class SaveInvoiceApplyItemCmd extends Cmd {
 
     private static Logger logger = LoggerFactory.getLogger(SaveInvoiceApplyItemCmd.class);

service-acct/src/main/java/com/java110/acct/cmd/invoiceApply/UpdateInvoiceApplyCmd.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.java110.acct.cmd.invoiceApply;
+package com.java110.acct.cmd.invoice;
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
@@ -21,7 +21,6 @@ import com.java110.core.annotation.Java110Transactional;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
-import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.intf.acct.IInvoiceApplyV1InnerServiceSMO;
 import com.java110.po.invoiceApply.InvoiceApplyPo;
 import com.java110.utils.exception.CmdException;
@@ -43,7 +42,7 @@ import org.slf4j.LoggerFactory;
  * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
  * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
  */
-@Java110Cmd(serviceCode = "invoiceApply.updateInvoiceApply")
+@Java110Cmd(serviceCode = "invoice.updateInvoiceApply")
 public class UpdateInvoiceApplyCmd extends Cmd {
 
     private static Logger logger = LoggerFactory.getLogger(UpdateInvoiceApplyCmd.class);

service-acct/src/main/java/com/java110/acct/cmd/invoiceApplyItem/UpdateInvoiceApplyItemCmd.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.java110.acct.cmd.invoiceApplyItem;
+package com.java110.acct.cmd.invoice;
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
@@ -21,7 +21,6 @@ import com.java110.core.annotation.Java110Transactional;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
-import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.intf.acct.IInvoiceApplyItemV1InnerServiceSMO;
 import com.java110.po.invoiceApplyItem.InvoiceApplyItemPo;
 import com.java110.utils.exception.CmdException;
@@ -43,7 +42,7 @@ import org.slf4j.LoggerFactory;
  * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
  * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
  */
-@Java110Cmd(serviceCode = "invoiceApplyItem.updateInvoiceApplyItem")
+@Java110Cmd(serviceCode = "invoice.updateInvoiceApplyItem")
 public class UpdateInvoiceApplyItemCmd extends Cmd {
 
     private static Logger logger = LoggerFactory.getLogger(UpdateInvoiceApplyItemCmd.class);