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

atms-api/src/main/java/pwc/taxtech/atms/controller/CellCommentController.java

@@ -7,10 +7,14 @@ import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.web.bind.annotation.*;
 import pwc.taxtech.atms.dao.CitJournalEntryAdjustMapper;
 import pwc.taxtech.atms.dao.CitTbamMapper;
+import pwc.taxtech.atms.dao.OperationLogEntryLogMapper;
 import pwc.taxtech.atms.dpo.CitTbamDto;
 import pwc.taxtech.atms.dto.OperationResultDto;
 import pwc.taxtech.atms.entity.CitJournalEntryAdjust;
 import pwc.taxtech.atms.entity.CitTbam;
+import pwc.taxtech.atms.entity.OperationLogEntryLog;
+import pwc.taxtech.atms.entity.OperationLogEntryLogExample;
+import pwc.taxtech.atms.service.impl.DistributedIdService;
 import pwc.taxtech.atms.vat.dao.JournalEntryMapper;
 import pwc.taxtech.atms.vat.dao.PeriodFormulaBlockMapper;
 import pwc.taxtech.atms.vat.entity.CellComment;
@@ -69,6 +73,11 @@ public class CellCommentController {
 
     @Autowired
     private PeriodFormulaBlockMapper periodFormulaBlockMapper;
+
+    @Autowired
+    private OperationLogEntryLogMapper operationLogEntryLogMapper;
+    @Autowired
+    private DistributedIdService distributedIdService;
     //更新调整后金额
     @RequestMapping("updateAdjust")
     public OperationResultDto updateAdjust(@RequestBody CitTbam[] citTbams){
@@ -77,8 +86,23 @@ public class CellCommentController {
         for(CitTbam citTbam1 : citTbams){
             citTbam.setId(citTbam1.getId());
             citTbamMapper.updateByPrimaryKey(citTbam);
+            for(OperationLogEntryLog operationLogEntryLog : citTbam1.getOperationLogEntryLogList()){
+                operationLogEntryLog.setMyId(distributedIdService.nextId());
+                operationLogEntryLogMapper.insert(operationLogEntryLog);
+            }
         }
         operationResultDto.setResultMsg("success");
         return operationResultDto;
     }
+
+    @RequestMapping("selectEntryLog")
+    public OperationResultDto selectEntryLog(String code){
+        OperationResultDto operationResultDto = new OperationResultDto();
+        OperationLogEntryLogExample operationLogEntryLogExample = new OperationLogEntryLogExample();
+        OperationLogEntryLogExample.Criteria criteria = operationLogEntryLogExample.createCriteria();
+        criteria.andSubjectCodeEqualTo(code);
+        operationResultDto.setData(operationLogEntryLogMapper.selectByExample(operationLogEntryLogExample));
+        return operationResultDto;
+    }
+
 }

atms-dao/etc/generator-mysql/generatorConfig.xml

@@ -41,7 +41,7 @@
             <property name="rootInterface" value="pwc.taxtech.atms.MyMapper"/>
         </javaClientGenerator>
 
-        <table tableName="organization_accounting_rate" domainObjectName="OrganizationAccountingRate">
+        <table tableName="operation_log_entry_log" domainObjectName="OperationLogEntryLog">
             <property name="useActualColumnNames" value="false"/>
             <property name="ignoreQualifiersAtRuntime" value="true"/>
         </table>

atms-dao/src/main/java/pwc/taxtech/atms/dao/OperationLogEntryLogMapper.java

+package pwc.taxtech.atms.dao;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.session.RowBounds;
+import pwc.taxtech.atms.MyMapper;
+import pwc.taxtech.atms.entity.OperationLogEntryLog;
+import pwc.taxtech.atms.entity.OperationLogEntryLogExample;
+
+@Mapper
+public interface OperationLogEntryLogMapper extends MyMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table operation_log_entry_log
+     *
+     * @mbg.generated
+     */
+    long countByExample(OperationLogEntryLogExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table operation_log_entry_log
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(OperationLogEntryLogExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table operation_log_entry_log
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(String subjectCode);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table operation_log_entry_log
+     *
+     * @mbg.generated
+     */
+    int insert(OperationLogEntryLog record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table operation_log_entry_log
+     *
+     * @mbg.generated
+     */
+    int insertSelective(OperationLogEntryLog record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table operation_log_entry_log
+     *
+     * @mbg.generated
+     */
+    List<OperationLogEntryLog> selectByExampleWithRowbounds(OperationLogEntryLogExample example, RowBounds rowBounds);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table operation_log_entry_log
+     *
+     * @mbg.generated
+     */
+    List<OperationLogEntryLog> selectByExample(OperationLogEntryLogExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table operation_log_entry_log
+     *
+     * @mbg.generated
+     */
+    OperationLogEntryLog selectByPrimaryKey(String subjectCode);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table operation_log_entry_log
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") OperationLogEntryLog record, @Param("example") OperationLogEntryLogExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table operation_log_entry_log
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") OperationLogEntryLog record, @Param("example") OperationLogEntryLogExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table operation_log_entry_log
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(OperationLogEntryLog record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table operation_log_entry_log
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(OperationLogEntryLog record);
+}
\ No newline at end of file

atms-dao/src/main/java/pwc/taxtech/atms/entity/CitTbam.java

@@ -3,6 +3,7 @@ package pwc.taxtech.atms.entity;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 /**
  *
@@ -35,6 +36,8 @@ public class CitTbam extends BaseEntity implements Serializable {
     private String organizationId;
     private Long adjustAccount;
 
+    private List<OperationLogEntryLog> operationLogEntryLogList;
+
     public Long getAdjustAccount() {
         return adjustAccount;
     }
@@ -43,6 +46,14 @@ public class CitTbam extends BaseEntity implements Serializable {
         this.adjustAccount = adjustAccount;
     }
 
+    public List<OperationLogEntryLog> getOperationLogEntryLogList() {
+        return operationLogEntryLogList;
+    }
+
+    public void setOperationLogEntryLogList(List<OperationLogEntryLog> operationLogEntryLogList) {
+        this.operationLogEntryLogList = operationLogEntryLogList;
+    }
+
     /**
      * Database Column Remarks:
      *   项目ID

atms-dao/src/main/java/pwc/taxtech/atms/entity/OperationLogEntryLog.java

+package pwc.taxtech.atms.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ *
+ * This class was generated by MyBatis Generator.
+ * This class corresponds to the database table operation_log_entry_log
+ *
+ * @mbg.generated do_not_delete_during_merge
+ */
+public class OperationLogEntryLog extends BaseEntity implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column operation_log_entry_log.subject_code
+     *
+     * @mbg.generated
+     */
+    private String subjectCode;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column operation_log_entry_log.my_id
+     *
+     * @mbg.generated
+     */
+    private Long myId;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column operation_log_entry_log.organization_id
+     *
+     * @mbg.generated
+     */
+    private String organizationId;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column operation_log_entry_log.account_period
+     *
+     * @mbg.generated
+     */
+    private String accountPeriod;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column operation_log_entry_log.accounted_dr
+     *
+     * @mbg.generated
+     */
+    private Long accountedDr;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column operation_log_entry_log.accounted_cr
+     *
+     * @mbg.generated
+     */
+    private Long accountedCr;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column operation_log_entry_log.accounting_date
+     *
+     * @mbg.generated
+     */
+    private Date accountingDate;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column operation_log_entry_log.approval_status
+     *
+     * @mbg.generated
+     */
+    private String approvalStatus;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column operation_log_entry_log.category
+     *
+     * @mbg.generated
+     */
+    private String category;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column operation_log_entry_log.id
+     *
+     * @mbg.generated
+     */
+    private Long id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column operation_log_entry_log.period
+     *
+     * @mbg.generated
+     */
+    private Integer period;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column operation_log_entry_log.source
+     *
+     * @mbg.generated
+     */
+    private String source;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column operation_log_entry_log.subject_name
+     *
+     * @mbg.generated
+     */
+    private String subjectName;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column operation_log_entry_log.update_time
+     *
+     * @mbg.generated
+     */
+    private Date updateTime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column operation_log_entry_log.voucher_num
+     *
+     * @mbg.generated
+     */
+    private String voucherNum;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column operation_log_entry_log.org_code
+     *
+     * @mbg.generated
+     */
+    private String orgCode;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column operation_log_entry_log.create_time
+     *
+     * @mbg.generated
+     */
+    private String createTime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column operation_log_entry_log.create_by
+     *
+     * @mbg.generated
+     */
+    private String createBy;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column operation_log_entry_log.update_by
+     *
+     * @mbg.generated
+     */
+    private String updateBy;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table operation_log_entry_log
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column operation_log_entry_log.subject_code
+     *
+     * @return the value of operation_log_entry_log.subject_code
+     *
+     * @mbg.generated
+     */
+    public String getSubjectCode() {
+        return subjectCode;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column operation_log_entry_log.subject_code
+     *
+     * @param subjectCode the value for operation_log_entry_log.subject_code
+     *
+     * @mbg.generated
+     */
+    public void setSubjectCode(String subjectCode) {
+        this.subjectCode = subjectCode == null ? null : subjectCode.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column operation_log_entry_log.my_id
+     *
+     * @return the value of operation_log_entry_log.my_id
+     *
+     * @mbg.generated
+     */
+    public Long getMyId() {
+        return myId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column operation_log_entry_log.my_id
+     *
+     * @param myId the value for operation_log_entry_log.my_id
+     *
+     * @mbg.generated
+     */
+    public void setMyId(Long myId) {
+        this.myId = myId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column operation_log_entry_log.organization_id
+     *
+     * @return the value of operation_log_entry_log.organization_id
+     *
+     * @mbg.generated
+     */
+    public String getOrganizationId() {
+        return organizationId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column operation_log_entry_log.organization_id
+     *
+     * @param organizationId the value for operation_log_entry_log.organization_id
+     *
+     * @mbg.generated
+     */
+    public void setOrganizationId(String organizationId) {
+        this.organizationId = organizationId == null ? null : organizationId.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column operation_log_entry_log.account_period
+     *
+     * @return the value of operation_log_entry_log.account_period
+     *
+     * @mbg.generated
+     */
+    public String getAccountPeriod() {
+        return accountPeriod;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column operation_log_entry_log.account_period
+     *
+     * @param accountPeriod the value for operation_log_entry_log.account_period
+     *
+     * @mbg.generated
+     */
+    public void setAccountPeriod(String accountPeriod) {
+        this.accountPeriod = accountPeriod == null ? null : accountPeriod.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column operation_log_entry_log.accounted_dr
+     *
+     * @return the value of operation_log_entry_log.accounted_dr
+     *
+     * @mbg.generated
+     */
+    public Long getAccountedDr() {
+        return accountedDr;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column operation_log_entry_log.accounted_dr
+     *
+     * @param accountedDr the value for operation_log_entry_log.accounted_dr
+     *
+     * @mbg.generated
+     */
+    public void setAccountedDr(Long accountedDr) {
+        this.accountedDr = accountedDr;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column operation_log_entry_log.accounted_cr
+     *
+     * @return the value of operation_log_entry_log.accounted_cr
+     *
+     * @mbg.generated
+     */
+    public Long getAccountedCr() {
+        return accountedCr;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column operation_log_entry_log.accounted_cr
+     *
+     * @param accountedCr the value for operation_log_entry_log.accounted_cr
+     *
+     * @mbg.generated
+     */
+    public void setAccountedCr(Long accountedCr) {
+        this.accountedCr = accountedCr;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column operation_log_entry_log.accounting_date
+     *
+     * @return the value of operation_log_entry_log.accounting_date
+     *
+     * @mbg.generated
+     */
+    public Date getAccountingDate() {
+        return accountingDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column operation_log_entry_log.accounting_date
+     *
+     * @param accountingDate the value for operation_log_entry_log.accounting_date
+     *
+     * @mbg.generated
+     */
+    public void setAccountingDate(Date accountingDate) {
+        this.accountingDate = accountingDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column operation_log_entry_log.approval_status
+     *
+     * @return the value of operation_log_entry_log.approval_status
+     *
+     * @mbg.generated
+     */
+    public String getApprovalStatus() {
+        return approvalStatus;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column operation_log_entry_log.approval_status
+     *
+     * @param approvalStatus the value for operation_log_entry_log.approval_status
+     *
+     * @mbg.generated
+     */
+    public void setApprovalStatus(String approvalStatus) {
+        this.approvalStatus = approvalStatus == null ? null : approvalStatus.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column operation_log_entry_log.category
+     *
+     * @return the value of operation_log_entry_log.category
+     *
+     * @mbg.generated
+     */
+    public String getCategory() {
+        return category;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column operation_log_entry_log.category
+     *
+     * @param category the value for operation_log_entry_log.category
+     *
+     * @mbg.generated
+     */
+    public void setCategory(String category) {
+        this.category = category == null ? null : category.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column operation_log_entry_log.id
+     *
+     * @return the value of operation_log_entry_log.id
+     *
+     * @mbg.generated
+     */
+    public Long getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column operation_log_entry_log.id
+     *
+     * @param id the value for operation_log_entry_log.id
+     *
+     * @mbg.generated
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column operation_log_entry_log.period
+     *
+     * @return the value of operation_log_entry_log.period
+     *
+     * @mbg.generated
+     */
+    public Integer getPeriod() {
+        return period;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column operation_log_entry_log.period
+     *
+     * @param period the value for operation_log_entry_log.period
+     *
+     * @mbg.generated
+     */
+    public void setPeriod(Integer period) {
+        this.period = period;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column operation_log_entry_log.source
+     *
+     * @return the value of operation_log_entry_log.source
+     *
+     * @mbg.generated
+     */
+    public String getSource() {
+        return source;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column operation_log_entry_log.source
+     *
+     * @param source the value for operation_log_entry_log.source
+     *
+     * @mbg.generated
+     */
+    public void setSource(String source) {
+        this.source = source == null ? null : source.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column operation_log_entry_log.subject_name
+     *
+     * @return the value of operation_log_entry_log.subject_name
+     *
+     * @mbg.generated
+     */
+    public String getSubjectName() {
+        return subjectName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column operation_log_entry_log.subject_name
+     *
+     * @param subjectName the value for operation_log_entry_log.subject_name
+     *
+     * @mbg.generated
+     */
+    public void setSubjectName(String subjectName) {
+        this.subjectName = subjectName == null ? null : subjectName.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column operation_log_entry_log.update_time
+     *
+     * @return the value of operation_log_entry_log.update_time
+     *
+     * @mbg.generated
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column operation_log_entry_log.update_time
+     *
+     * @param updateTime the value for operation_log_entry_log.update_time
+     *
+     * @mbg.generated
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column operation_log_entry_log.voucher_num
+     *
+     * @return the value of operation_log_entry_log.voucher_num
+     *
+     * @mbg.generated
+     */
+    public String getVoucherNum() {
+        return voucherNum;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column operation_log_entry_log.voucher_num
+     *
+     * @param voucherNum the value for operation_log_entry_log.voucher_num
+     *
+     * @mbg.generated
+     */
+    public void setVoucherNum(String voucherNum) {
+        this.voucherNum = voucherNum == null ? null : voucherNum.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column operation_log_entry_log.org_code
+     *
+     * @return the value of operation_log_entry_log.org_code
+     *
+     * @mbg.generated
+     */
+    public String getOrgCode() {
+        return orgCode;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column operation_log_entry_log.org_code
+     *
+     * @param orgCode the value for operation_log_entry_log.org_code
+     *
+     * @mbg.generated
+     */
+    public void setOrgCode(String orgCode) {
+        this.orgCode = orgCode == null ? null : orgCode.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column operation_log_entry_log.create_time
+     *
+     * @return the value of operation_log_entry_log.create_time
+     *
+     * @mbg.generated
+     */
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column operation_log_entry_log.create_time
+     *
+     * @param createTime the value for operation_log_entry_log.create_time
+     *
+     * @mbg.generated
+     */
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime == null ? null : createTime.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column operation_log_entry_log.create_by
+     *
+     * @return the value of operation_log_entry_log.create_by
+     *
+     * @mbg.generated
+     */
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column operation_log_entry_log.create_by
+     *
+     * @param createBy the value for operation_log_entry_log.create_by
+     *
+     * @mbg.generated
+     */
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy == null ? null : createBy.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column operation_log_entry_log.update_by
+     *
+     * @return the value of operation_log_entry_log.update_by
+     *
+     * @mbg.generated
+     */
+    public String getUpdateBy() {
+        return updateBy;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column operation_log_entry_log.update_by
+     *
+     * @param updateBy the value for operation_log_entry_log.update_by
+     *
+     * @mbg.generated
+     */
+    public void setUpdateBy(String updateBy) {
+        this.updateBy = updateBy == null ? null : updateBy.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table operation_log_entry_log
+     *
+     * @mbg.generated
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", subjectCode=").append(subjectCode);
+        sb.append(", myId=").append(myId);
+        sb.append(", organizationId=").append(organizationId);
+        sb.append(", accountPeriod=").append(accountPeriod);
+        sb.append(", accountedDr=").append(accountedDr);
+        sb.append(", accountedCr=").append(accountedCr);
+        sb.append(", accountingDate=").append(accountingDate);
+        sb.append(", approvalStatus=").append(approvalStatus);
+        sb.append(", category=").append(category);
+        sb.append(", id=").append(id);
+        sb.append(", period=").append(period);
+        sb.append(", source=").append(source);
+        sb.append(", subjectName=").append(subjectName);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", voucherNum=").append(voucherNum);
+        sb.append(", orgCode=").append(orgCode);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", createBy=").append(createBy);
+        sb.append(", updateBy=").append(updateBy);
+        sb.append("]");
+        return sb.toString();
+    }
+}
\ No newline at end of file

atms-dao/src/main/java/pwc/taxtech/atms/entity/OperationLogEntryLogExample.java

+package pwc.taxtech.atms.entity;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class OperationLogEntryLogExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table operation_log_entry_log
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table operation_log_entry_log
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table operation_log_entry_log
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table operation_log_entry_log
+     *
+     * @mbg.generated
+     */
+    public OperationLogEntryLogExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table operation_log_entry_log
+     *
+     * @mbg.generated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table operation_log_entry_log
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table operation_log_entry_log
+     *
+     * @mbg.generated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table operation_log_entry_log
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table operation_log_entry_log
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table operation_log_entry_log
+     *
+     * @mbg.generated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table operation_log_entry_log
+     *
+     * @mbg.generated
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table operation_log_entry_log
+     *
+     * @mbg.generated
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table operation_log_entry_log
+     *
+     * @mbg.generated
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table operation_log_entry_log
+     *
+     * @mbg.generated
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table operation_log_entry_log
+     *
+     * @mbg.generated
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andSubjectCodeIsNull() {
+            addCriterion("subject_code is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubjectCodeIsNotNull() {
+            addCriterion("subject_code is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubjectCodeEqualTo(String value) {
+            addCriterion("subject_code =", value, "subjectCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubjectCodeNotEqualTo(String value) {
+            addCriterion("subject_code <>", value, "subjectCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubjectCodeGreaterThan(String value) {
+            addCriterion("subject_code >", value, "subjectCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubjectCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("subject_code >=", value, "subjectCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubjectCodeLessThan(String value) {
+            addCriterion("subject_code <", value, "subjectCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubjectCodeLessThanOrEqualTo(String value) {
+            addCriterion("subject_code <=", value, "subjectCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubjectCodeLike(String value) {
+            addCriterion("subject_code like", value, "subjectCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubjectCodeNotLike(String value) {
+            addCriterion("subject_code not like", value, "subjectCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubjectCodeIn(List<String> values) {
+            addCriterion("subject_code in", values, "subjectCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubjectCodeNotIn(List<String> values) {
+            addCriterion("subject_code not in", values, "subjectCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubjectCodeBetween(String value1, String value2) {
+            addCriterion("subject_code between", value1, value2, "subjectCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubjectCodeNotBetween(String value1, String value2) {
+            addCriterion("subject_code not between", value1, value2, "subjectCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andMyIdIsNull() {
+            addCriterion("my_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMyIdIsNotNull() {
+            addCriterion("my_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMyIdEqualTo(Long value) {
+            addCriterion("my_id =", value, "myId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMyIdNotEqualTo(Long value) {
+            addCriterion("my_id <>", value, "myId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMyIdGreaterThan(Long value) {
+            addCriterion("my_id >", value, "myId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMyIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("my_id >=", value, "myId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMyIdLessThan(Long value) {
+            addCriterion("my_id <", value, "myId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMyIdLessThanOrEqualTo(Long value) {
+            addCriterion("my_id <=", value, "myId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMyIdIn(List<Long> values) {
+            addCriterion("my_id in", values, "myId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMyIdNotIn(List<Long> values) {
+            addCriterion("my_id not in", values, "myId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMyIdBetween(Long value1, Long value2) {
+            addCriterion("my_id between", value1, value2, "myId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMyIdNotBetween(Long value1, Long value2) {
+            addCriterion("my_id not between", value1, value2, "myId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdIsNull() {
+            addCriterion("organization_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdIsNotNull() {
+            addCriterion("organization_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdEqualTo(String value) {
+            addCriterion("organization_id =", value, "organizationId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdNotEqualTo(String value) {
+            addCriterion("organization_id <>", value, "organizationId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdGreaterThan(String value) {
+            addCriterion("organization_id >", value, "organizationId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdGreaterThanOrEqualTo(String value) {
+            addCriterion("organization_id >=", value, "organizationId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdLessThan(String value) {
+            addCriterion("organization_id <", value, "organizationId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdLessThanOrEqualTo(String value) {
+            addCriterion("organization_id <=", value, "organizationId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdLike(String value) {
+            addCriterion("organization_id like", value, "organizationId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdNotLike(String value) {
+            addCriterion("organization_id not like", value, "organizationId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdIn(List<String> values) {
+            addCriterion("organization_id in", values, "organizationId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdNotIn(List<String> values) {
+            addCriterion("organization_id not in", values, "organizationId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdBetween(String value1, String value2) {
+            addCriterion("organization_id between", value1, value2, "organizationId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdNotBetween(String value1, String value2) {
+            addCriterion("organization_id not between", value1, value2, "organizationId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountPeriodIsNull() {
+            addCriterion("account_period is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountPeriodIsNotNull() {
+            addCriterion("account_period is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountPeriodEqualTo(String value) {
+            addCriterion("account_period =", value, "accountPeriod");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountPeriodNotEqualTo(String value) {
+            addCriterion("account_period <>", value, "accountPeriod");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountPeriodGreaterThan(String value) {
+            addCriterion("account_period >", value, "accountPeriod");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountPeriodGreaterThanOrEqualTo(String value) {
+            addCriterion("account_period >=", value, "accountPeriod");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountPeriodLessThan(String value) {
+            addCriterion("account_period <", value, "accountPeriod");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountPeriodLessThanOrEqualTo(String value) {
+            addCriterion("account_period <=", value, "accountPeriod");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountPeriodLike(String value) {
+            addCriterion("account_period like", value, "accountPeriod");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountPeriodNotLike(String value) {
+            addCriterion("account_period not like", value, "accountPeriod");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountPeriodIn(List<String> values) {
+            addCriterion("account_period in", values, "accountPeriod");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountPeriodNotIn(List<String> values) {
+            addCriterion("account_period not in", values, "accountPeriod");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountPeriodBetween(String value1, String value2) {
+            addCriterion("account_period between", value1, value2, "accountPeriod");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountPeriodNotBetween(String value1, String value2) {
+            addCriterion("account_period not between", value1, value2, "accountPeriod");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountedDrIsNull() {
+            addCriterion("accounted_dr is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountedDrIsNotNull() {
+            addCriterion("accounted_dr is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountedDrEqualTo(Long value) {
+            addCriterion("accounted_dr =", value, "accountedDr");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountedDrNotEqualTo(Long value) {
+            addCriterion("accounted_dr <>", value, "accountedDr");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountedDrGreaterThan(Long value) {
+            addCriterion("accounted_dr >", value, "accountedDr");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountedDrGreaterThanOrEqualTo(Long value) {
+            addCriterion("accounted_dr >=", value, "accountedDr");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountedDrLessThan(Long value) {
+            addCriterion("accounted_dr <", value, "accountedDr");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountedDrLessThanOrEqualTo(Long value) {
+            addCriterion("accounted_dr <=", value, "accountedDr");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountedDrIn(List<Long> values) {
+            addCriterion("accounted_dr in", values, "accountedDr");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountedDrNotIn(List<Long> values) {
+            addCriterion("accounted_dr not in", values, "accountedDr");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountedDrBetween(Long value1, Long value2) {
+            addCriterion("accounted_dr between", value1, value2, "accountedDr");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountedDrNotBetween(Long value1, Long value2) {
+            addCriterion("accounted_dr not between", value1, value2, "accountedDr");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountedCrIsNull() {
+            addCriterion("accounted_cr is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountedCrIsNotNull() {
+            addCriterion("accounted_cr is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountedCrEqualTo(Long value) {
+            addCriterion("accounted_cr =", value, "accountedCr");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountedCrNotEqualTo(Long value) {
+            addCriterion("accounted_cr <>", value, "accountedCr");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountedCrGreaterThan(Long value) {
+            addCriterion("accounted_cr >", value, "accountedCr");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountedCrGreaterThanOrEqualTo(Long value) {
+            addCriterion("accounted_cr >=", value, "accountedCr");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountedCrLessThan(Long value) {
+            addCriterion("accounted_cr <", value, "accountedCr");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountedCrLessThanOrEqualTo(Long value) {
+            addCriterion("accounted_cr <=", value, "accountedCr");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountedCrIn(List<Long> values) {
+            addCriterion("accounted_cr in", values, "accountedCr");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountedCrNotIn(List<Long> values) {
+            addCriterion("accounted_cr not in", values, "accountedCr");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountedCrBetween(Long value1, Long value2) {
+            addCriterion("accounted_cr between", value1, value2, "accountedCr");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountedCrNotBetween(Long value1, Long value2) {
+            addCriterion("accounted_cr not between", value1, value2, "accountedCr");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountingDateIsNull() {
+            addCriterion("accounting_date is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountingDateIsNotNull() {
+            addCriterion("accounting_date is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountingDateEqualTo(Date value) {
+            addCriterion("accounting_date =", value, "accountingDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountingDateNotEqualTo(Date value) {
+            addCriterion("accounting_date <>", value, "accountingDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountingDateGreaterThan(Date value) {
+            addCriterion("accounting_date >", value, "accountingDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountingDateGreaterThanOrEqualTo(Date value) {
+            addCriterion("accounting_date >=", value, "accountingDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountingDateLessThan(Date value) {
+            addCriterion("accounting_date <", value, "accountingDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountingDateLessThanOrEqualTo(Date value) {
+            addCriterion("accounting_date <=", value, "accountingDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountingDateIn(List<Date> values) {
+            addCriterion("accounting_date in", values, "accountingDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountingDateNotIn(List<Date> values) {
+            addCriterion("accounting_date not in", values, "accountingDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountingDateBetween(Date value1, Date value2) {
+            addCriterion("accounting_date between", value1, value2, "accountingDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountingDateNotBetween(Date value1, Date value2) {
+            addCriterion("accounting_date not between", value1, value2, "accountingDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andApprovalStatusIsNull() {
+            addCriterion("approval_status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andApprovalStatusIsNotNull() {
+            addCriterion("approval_status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andApprovalStatusEqualTo(String value) {
+            addCriterion("approval_status =", value, "approvalStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andApprovalStatusNotEqualTo(String value) {
+            addCriterion("approval_status <>", value, "approvalStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andApprovalStatusGreaterThan(String value) {
+            addCriterion("approval_status >", value, "approvalStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andApprovalStatusGreaterThanOrEqualTo(String value) {
+            addCriterion("approval_status >=", value, "approvalStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andApprovalStatusLessThan(String value) {
+            addCriterion("approval_status <", value, "approvalStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andApprovalStatusLessThanOrEqualTo(String value) {
+            addCriterion("approval_status <=", value, "approvalStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andApprovalStatusLike(String value) {
+            addCriterion("approval_status like", value, "approvalStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andApprovalStatusNotLike(String value) {
+            addCriterion("approval_status not like", value, "approvalStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andApprovalStatusIn(List<String> values) {
+            addCriterion("approval_status in", values, "approvalStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andApprovalStatusNotIn(List<String> values) {
+            addCriterion("approval_status not in", values, "approvalStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andApprovalStatusBetween(String value1, String value2) {
+            addCriterion("approval_status between", value1, value2, "approvalStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andApprovalStatusNotBetween(String value1, String value2) {
+            addCriterion("approval_status not between", value1, value2, "approvalStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryIsNull() {
+            addCriterion("category is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryIsNotNull() {
+            addCriterion("category is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryEqualTo(String value) {
+            addCriterion("category =", value, "category");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryNotEqualTo(String value) {
+            addCriterion("category <>", value, "category");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryGreaterThan(String value) {
+            addCriterion("category >", value, "category");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryGreaterThanOrEqualTo(String value) {
+            addCriterion("category >=", value, "category");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryLessThan(String value) {
+            addCriterion("category <", value, "category");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryLessThanOrEqualTo(String value) {
+            addCriterion("category <=", value, "category");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryLike(String value) {
+            addCriterion("category like", value, "category");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryNotLike(String value) {
+            addCriterion("category not like", value, "category");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryIn(List<String> values) {
+            addCriterion("category in", values, "category");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryNotIn(List<String> values) {
+            addCriterion("category not in", values, "category");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryBetween(String value1, String value2) {
+            addCriterion("category between", value1, value2, "category");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryNotBetween(String value1, String value2) {
+            addCriterion("category not between", value1, value2, "category");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Long value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Long value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Long value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Long value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Long value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Long> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Long> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Long value1, Long value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Long value1, Long value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodIsNull() {
+            addCriterion("period is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodIsNotNull() {
+            addCriterion("period is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodEqualTo(Integer value) {
+            addCriterion("period =", value, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodNotEqualTo(Integer value) {
+            addCriterion("period <>", value, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodGreaterThan(Integer value) {
+            addCriterion("period >", value, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodGreaterThanOrEqualTo(Integer value) {
+            addCriterion("period >=", value, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodLessThan(Integer value) {
+            addCriterion("period <", value, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodLessThanOrEqualTo(Integer value) {
+            addCriterion("period <=", value, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodIn(List<Integer> values) {
+            addCriterion("period in", values, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodNotIn(List<Integer> values) {
+            addCriterion("period not in", values, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodBetween(Integer value1, Integer value2) {
+            addCriterion("period between", value1, value2, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodNotBetween(Integer value1, Integer value2) {
+            addCriterion("period not between", value1, value2, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceIsNull() {
+            addCriterion("source is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceIsNotNull() {
+            addCriterion("source is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceEqualTo(String value) {
+            addCriterion("source =", value, "source");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceNotEqualTo(String value) {
+            addCriterion("source <>", value, "source");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceGreaterThan(String value) {
+            addCriterion("source >", value, "source");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceGreaterThanOrEqualTo(String value) {
+            addCriterion("source >=", value, "source");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceLessThan(String value) {
+            addCriterion("source <", value, "source");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceLessThanOrEqualTo(String value) {
+            addCriterion("source <=", value, "source");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceLike(String value) {
+            addCriterion("source like", value, "source");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceNotLike(String value) {
+            addCriterion("source not like", value, "source");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceIn(List<String> values) {
+            addCriterion("source in", values, "source");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceNotIn(List<String> values) {
+            addCriterion("source not in", values, "source");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceBetween(String value1, String value2) {
+            addCriterion("source between", value1, value2, "source");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceNotBetween(String value1, String value2) {
+            addCriterion("source not between", value1, value2, "source");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubjectNameIsNull() {
+            addCriterion("subject_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubjectNameIsNotNull() {
+            addCriterion("subject_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubjectNameEqualTo(String value) {
+            addCriterion("subject_name =", value, "subjectName");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubjectNameNotEqualTo(String value) {
+            addCriterion("subject_name <>", value, "subjectName");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubjectNameGreaterThan(String value) {
+            addCriterion("subject_name >", value, "subjectName");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubjectNameGreaterThanOrEqualTo(String value) {
+            addCriterion("subject_name >=", value, "subjectName");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubjectNameLessThan(String value) {
+            addCriterion("subject_name <", value, "subjectName");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubjectNameLessThanOrEqualTo(String value) {
+            addCriterion("subject_name <=", value, "subjectName");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubjectNameLike(String value) {
+            addCriterion("subject_name like", value, "subjectName");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubjectNameNotLike(String value) {
+            addCriterion("subject_name not like", value, "subjectName");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubjectNameIn(List<String> values) {
+            addCriterion("subject_name in", values, "subjectName");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubjectNameNotIn(List<String> values) {
+            addCriterion("subject_name not in", values, "subjectName");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubjectNameBetween(String value1, String value2) {
+            addCriterion("subject_name between", value1, value2, "subjectName");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubjectNameNotBetween(String value1, String value2) {
+            addCriterion("subject_name not between", value1, value2, "subjectName");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("update_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("update_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(Date value) {
+            addCriterion("update_time =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(Date value) {
+            addCriterion("update_time <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(Date value) {
+            addCriterion("update_time >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("update_time >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(Date value) {
+            addCriterion("update_time <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("update_time <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<Date> values) {
+            addCriterion("update_time in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<Date> values) {
+            addCriterion("update_time not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(Date value1, Date value2) {
+            addCriterion("update_time between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("update_time not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andVoucherNumIsNull() {
+            addCriterion("voucher_num is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andVoucherNumIsNotNull() {
+            addCriterion("voucher_num is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andVoucherNumEqualTo(String value) {
+            addCriterion("voucher_num =", value, "voucherNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andVoucherNumNotEqualTo(String value) {
+            addCriterion("voucher_num <>", value, "voucherNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andVoucherNumGreaterThan(String value) {
+            addCriterion("voucher_num >", value, "voucherNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andVoucherNumGreaterThanOrEqualTo(String value) {
+            addCriterion("voucher_num >=", value, "voucherNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andVoucherNumLessThan(String value) {
+            addCriterion("voucher_num <", value, "voucherNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andVoucherNumLessThanOrEqualTo(String value) {
+            addCriterion("voucher_num <=", value, "voucherNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andVoucherNumLike(String value) {
+            addCriterion("voucher_num like", value, "voucherNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andVoucherNumNotLike(String value) {
+            addCriterion("voucher_num not like", value, "voucherNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andVoucherNumIn(List<String> values) {
+            addCriterion("voucher_num in", values, "voucherNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andVoucherNumNotIn(List<String> values) {
+            addCriterion("voucher_num not in", values, "voucherNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andVoucherNumBetween(String value1, String value2) {
+            addCriterion("voucher_num between", value1, value2, "voucherNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andVoucherNumNotBetween(String value1, String value2) {
+            addCriterion("voucher_num not between", value1, value2, "voucherNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgCodeIsNull() {
+            addCriterion("org_code is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgCodeIsNotNull() {
+            addCriterion("org_code is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgCodeEqualTo(String value) {
+            addCriterion("org_code =", value, "orgCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgCodeNotEqualTo(String value) {
+            addCriterion("org_code <>", value, "orgCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgCodeGreaterThan(String value) {
+            addCriterion("org_code >", value, "orgCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("org_code >=", value, "orgCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgCodeLessThan(String value) {
+            addCriterion("org_code <", value, "orgCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgCodeLessThanOrEqualTo(String value) {
+            addCriterion("org_code <=", value, "orgCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgCodeLike(String value) {
+            addCriterion("org_code like", value, "orgCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgCodeNotLike(String value) {
+            addCriterion("org_code not like", value, "orgCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgCodeIn(List<String> values) {
+            addCriterion("org_code in", values, "orgCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgCodeNotIn(List<String> values) {
+            addCriterion("org_code not in", values, "orgCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgCodeBetween(String value1, String value2) {
+            addCriterion("org_code between", value1, value2, "orgCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgCodeNotBetween(String value1, String value2) {
+            addCriterion("org_code not between", value1, value2, "orgCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(String value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(String value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(String value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(String value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(String value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(String value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLike(String value) {
+            addCriterion("create_time like", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotLike(String value) {
+            addCriterion("create_time not like", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<String> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<String> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(String value1, String value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(String value1, String value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByIsNull() {
+            addCriterion("create_by is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByIsNotNull() {
+            addCriterion("create_by is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByEqualTo(String value) {
+            addCriterion("create_by =", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByNotEqualTo(String value) {
+            addCriterion("create_by <>", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByGreaterThan(String value) {
+            addCriterion("create_by >", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByGreaterThanOrEqualTo(String value) {
+            addCriterion("create_by >=", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByLessThan(String value) {
+            addCriterion("create_by <", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByLessThanOrEqualTo(String value) {
+            addCriterion("create_by <=", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByLike(String value) {
+            addCriterion("create_by like", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByNotLike(String value) {
+            addCriterion("create_by not like", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByIn(List<String> values) {
+            addCriterion("create_by in", values, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByNotIn(List<String> values) {
+            addCriterion("create_by not in", values, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByBetween(String value1, String value2) {
+            addCriterion("create_by between", value1, value2, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByNotBetween(String value1, String value2) {
+            addCriterion("create_by not between", value1, value2, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByIsNull() {
+            addCriterion("update_by is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByIsNotNull() {
+            addCriterion("update_by is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByEqualTo(String value) {
+            addCriterion("update_by =", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByNotEqualTo(String value) {
+            addCriterion("update_by <>", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByGreaterThan(String value) {
+            addCriterion("update_by >", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByGreaterThanOrEqualTo(String value) {
+            addCriterion("update_by >=", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByLessThan(String value) {
+            addCriterion("update_by <", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByLessThanOrEqualTo(String value) {
+            addCriterion("update_by <=", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByLike(String value) {
+            addCriterion("update_by like", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByNotLike(String value) {
+            addCriterion("update_by not like", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByIn(List<String> values) {
+            addCriterion("update_by in", values, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByNotIn(List<String> values) {
+            addCriterion("update_by not in", values, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByBetween(String value1, String value2) {
+            addCriterion("update_by between", value1, value2, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByNotBetween(String value1, String value2) {
+            addCriterion("update_by not between", value1, value2, "updateBy");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table operation_log_entry_log
+     *
+     * @mbg.generated do_not_delete_during_merge
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table operation_log_entry_log
+     *
+     * @mbg.generated
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}
\ No newline at end of file

atms-dao/src/main/resources/pwc/taxtech/atms/dao/OperationLogEntryLogMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="pwc.taxtech.atms.dao.OperationLogEntryLogMapper">
+  <resultMap id="BaseResultMap" type="pwc.taxtech.atms.entity.OperationLogEntryLog">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="subject_code" jdbcType="VARCHAR" property="subjectCode" />
+    <result column="my_id" jdbcType="BIGINT" property="myId" />
+    <result column="organization_id" jdbcType="VARCHAR" property="organizationId" />
+    <result column="account_period" jdbcType="VARCHAR" property="accountPeriod" />
+    <result column="accounted_dr" jdbcType="BIGINT" property="accountedDr" />
+    <result column="accounted_cr" jdbcType="BIGINT" property="accountedCr" />
+    <result column="accounting_date" jdbcType="TIMESTAMP" property="accountingDate" />
+    <result column="approval_status" jdbcType="VARCHAR" property="approvalStatus" />
+    <result column="category" jdbcType="VARCHAR" property="category" />
+    <result column="id" jdbcType="BIGINT" property="id" />
+    <result column="period" jdbcType="INTEGER" property="period" />
+    <result column="source" jdbcType="VARCHAR" property="source" />
+    <result column="subject_name" jdbcType="VARCHAR" property="subjectName" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="voucher_num" jdbcType="VARCHAR" property="voucherNum" />
+    <result column="org_code" jdbcType="VARCHAR" property="orgCode" />
+    <result column="create_time" jdbcType="VARCHAR" property="createTime" />
+    <result column="create_by" jdbcType="VARCHAR" property="createBy" />
+    <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    subject_code, my_id, organization_id, account_period, accounted_dr, accounted_cr, 
+    accounting_date, approval_status, category, id, period, source, subject_name, update_time, 
+    voucher_num, org_code, create_time, create_by, update_by
+  </sql>
+  <select id="selectByExample" parameterType="pwc.taxtech.atms.entity.OperationLogEntryLogExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from operation_log_entry_log
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from operation_log_entry_log
+    where subject_code = #{subjectCode,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from operation_log_entry_log
+    where subject_code = #{subjectCode,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="pwc.taxtech.atms.entity.OperationLogEntryLogExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from operation_log_entry_log
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="pwc.taxtech.atms.entity.OperationLogEntryLog">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into operation_log_entry_log (subject_code, my_id, organization_id, 
+      account_period, accounted_dr, accounted_cr, 
+      accounting_date, approval_status, category, 
+      id, period, source, 
+      subject_name, update_time, voucher_num, 
+      org_code, create_time, create_by, 
+      update_by)
+    values (#{subjectCode,jdbcType=VARCHAR}, #{myId,jdbcType=BIGINT}, #{organizationId,jdbcType=VARCHAR}, 
+      #{accountPeriod,jdbcType=VARCHAR}, #{accountedDr,jdbcType=BIGINT}, #{accountedCr,jdbcType=BIGINT}, 
+      #{accountingDate,jdbcType=TIMESTAMP}, #{approvalStatus,jdbcType=VARCHAR}, #{category,jdbcType=VARCHAR}, 
+      #{id,jdbcType=BIGINT}, #{period,jdbcType=INTEGER}, #{source,jdbcType=VARCHAR}, 
+      #{subjectName,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{voucherNum,jdbcType=VARCHAR}, 
+      #{orgCode,jdbcType=VARCHAR}, #{createTime,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, 
+      #{updateBy,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="pwc.taxtech.atms.entity.OperationLogEntryLog">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into operation_log_entry_log
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="subjectCode != null">
+        subject_code,
+      </if>
+      <if test="myId != null">
+        my_id,
+      </if>
+      <if test="organizationId != null">
+        organization_id,
+      </if>
+      <if test="accountPeriod != null">
+        account_period,
+      </if>
+      <if test="accountedDr != null">
+        accounted_dr,
+      </if>
+      <if test="accountedCr != null">
+        accounted_cr,
+      </if>
+      <if test="accountingDate != null">
+        accounting_date,
+      </if>
+      <if test="approvalStatus != null">
+        approval_status,
+      </if>
+      <if test="category != null">
+        category,
+      </if>
+      <if test="id != null">
+        id,
+      </if>
+      <if test="period != null">
+        period,
+      </if>
+      <if test="source != null">
+        source,
+      </if>
+      <if test="subjectName != null">
+        subject_name,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+      <if test="voucherNum != null">
+        voucher_num,
+      </if>
+      <if test="orgCode != null">
+        org_code,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="createBy != null">
+        create_by,
+      </if>
+      <if test="updateBy != null">
+        update_by,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="subjectCode != null">
+        #{subjectCode,jdbcType=VARCHAR},
+      </if>
+      <if test="myId != null">
+        #{myId,jdbcType=BIGINT},
+      </if>
+      <if test="organizationId != null">
+        #{organizationId,jdbcType=VARCHAR},
+      </if>
+      <if test="accountPeriod != null">
+        #{accountPeriod,jdbcType=VARCHAR},
+      </if>
+      <if test="accountedDr != null">
+        #{accountedDr,jdbcType=BIGINT},
+      </if>
+      <if test="accountedCr != null">
+        #{accountedCr,jdbcType=BIGINT},
+      </if>
+      <if test="accountingDate != null">
+        #{accountingDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="approvalStatus != null">
+        #{approvalStatus,jdbcType=VARCHAR},
+      </if>
+      <if test="category != null">
+        #{category,jdbcType=VARCHAR},
+      </if>
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="period != null">
+        #{period,jdbcType=INTEGER},
+      </if>
+      <if test="source != null">
+        #{source,jdbcType=VARCHAR},
+      </if>
+      <if test="subjectName != null">
+        #{subjectName,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="voucherNum != null">
+        #{voucherNum,jdbcType=VARCHAR},
+      </if>
+      <if test="orgCode != null">
+        #{orgCode,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="createBy != null">
+        #{createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="updateBy != null">
+        #{updateBy,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="pwc.taxtech.atms.entity.OperationLogEntryLogExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from operation_log_entry_log
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update operation_log_entry_log
+    <set>
+      <if test="record.subjectCode != null">
+        subject_code = #{record.subjectCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.myId != null">
+        my_id = #{record.myId,jdbcType=BIGINT},
+      </if>
+      <if test="record.organizationId != null">
+        organization_id = #{record.organizationId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.accountPeriod != null">
+        account_period = #{record.accountPeriod,jdbcType=VARCHAR},
+      </if>
+      <if test="record.accountedDr != null">
+        accounted_dr = #{record.accountedDr,jdbcType=BIGINT},
+      </if>
+      <if test="record.accountedCr != null">
+        accounted_cr = #{record.accountedCr,jdbcType=BIGINT},
+      </if>
+      <if test="record.accountingDate != null">
+        accounting_date = #{record.accountingDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.approvalStatus != null">
+        approval_status = #{record.approvalStatus,jdbcType=VARCHAR},
+      </if>
+      <if test="record.category != null">
+        category = #{record.category,jdbcType=VARCHAR},
+      </if>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.period != null">
+        period = #{record.period,jdbcType=INTEGER},
+      </if>
+      <if test="record.source != null">
+        source = #{record.source,jdbcType=VARCHAR},
+      </if>
+      <if test="record.subjectName != null">
+        subject_name = #{record.subjectName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateTime != null">
+        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.voucherNum != null">
+        voucher_num = #{record.voucherNum,jdbcType=VARCHAR},
+      </if>
+      <if test="record.orgCode != null">
+        org_code = #{record.orgCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createBy != null">
+        create_by = #{record.createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateBy != null">
+        update_by = #{record.updateBy,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update operation_log_entry_log
+    set subject_code = #{record.subjectCode,jdbcType=VARCHAR},
+      my_id = #{record.myId,jdbcType=BIGINT},
+      organization_id = #{record.organizationId,jdbcType=VARCHAR},
+      account_period = #{record.accountPeriod,jdbcType=VARCHAR},
+      accounted_dr = #{record.accountedDr,jdbcType=BIGINT},
+      accounted_cr = #{record.accountedCr,jdbcType=BIGINT},
+      accounting_date = #{record.accountingDate,jdbcType=TIMESTAMP},
+      approval_status = #{record.approvalStatus,jdbcType=VARCHAR},
+      category = #{record.category,jdbcType=VARCHAR},
+      id = #{record.id,jdbcType=BIGINT},
+      period = #{record.period,jdbcType=INTEGER},
+      source = #{record.source,jdbcType=VARCHAR},
+      subject_name = #{record.subjectName,jdbcType=VARCHAR},
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      voucher_num = #{record.voucherNum,jdbcType=VARCHAR},
+      org_code = #{record.orgCode,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=VARCHAR},
+      create_by = #{record.createBy,jdbcType=VARCHAR},
+      update_by = #{record.updateBy,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="pwc.taxtech.atms.entity.OperationLogEntryLog">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update operation_log_entry_log
+    <set>
+      <if test="myId != null">
+        my_id = #{myId,jdbcType=BIGINT},
+      </if>
+      <if test="organizationId != null">
+        organization_id = #{organizationId,jdbcType=VARCHAR},
+      </if>
+      <if test="accountPeriod != null">
+        account_period = #{accountPeriod,jdbcType=VARCHAR},
+      </if>
+      <if test="accountedDr != null">
+        accounted_dr = #{accountedDr,jdbcType=BIGINT},
+      </if>
+      <if test="accountedCr != null">
+        accounted_cr = #{accountedCr,jdbcType=BIGINT},
+      </if>
+      <if test="accountingDate != null">
+        accounting_date = #{accountingDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="approvalStatus != null">
+        approval_status = #{approvalStatus,jdbcType=VARCHAR},
+      </if>
+      <if test="category != null">
+        category = #{category,jdbcType=VARCHAR},
+      </if>
+      <if test="id != null">
+        id = #{id,jdbcType=BIGINT},
+      </if>
+      <if test="period != null">
+        period = #{period,jdbcType=INTEGER},
+      </if>
+      <if test="source != null">
+        source = #{source,jdbcType=VARCHAR},
+      </if>
+      <if test="subjectName != null">
+        subject_name = #{subjectName,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="voucherNum != null">
+        voucher_num = #{voucherNum,jdbcType=VARCHAR},
+      </if>
+      <if test="orgCode != null">
+        org_code = #{orgCode,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="createBy != null">
+        create_by = #{createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="updateBy != null">
+        update_by = #{updateBy,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where subject_code = #{subjectCode,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="pwc.taxtech.atms.entity.OperationLogEntryLog">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update operation_log_entry_log
+    set my_id = #{myId,jdbcType=BIGINT},
+      organization_id = #{organizationId,jdbcType=VARCHAR},
+      account_period = #{accountPeriod,jdbcType=VARCHAR},
+      accounted_dr = #{accountedDr,jdbcType=BIGINT},
+      accounted_cr = #{accountedCr,jdbcType=BIGINT},
+      accounting_date = #{accountingDate,jdbcType=TIMESTAMP},
+      approval_status = #{approvalStatus,jdbcType=VARCHAR},
+      category = #{category,jdbcType=VARCHAR},
+      id = #{id,jdbcType=BIGINT},
+      period = #{period,jdbcType=INTEGER},
+      source = #{source,jdbcType=VARCHAR},
+      subject_name = #{subjectName,jdbcType=VARCHAR},
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      voucher_num = #{voucherNum,jdbcType=VARCHAR},
+      org_code = #{orgCode,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=VARCHAR},
+      create_by = #{createBy,jdbcType=VARCHAR},
+      update_by = #{updateBy,jdbcType=VARCHAR}
+    where subject_code = #{subjectCode,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByExampleWithRowbounds" parameterType="pwc.taxtech.atms.entity.OperationLogEntryLogExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from operation_log_entry_log
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+</mapper>
\ No newline at end of file

atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/CitTbamExtendsMapper.xml

@@ -83,8 +83,6 @@
     </insert>
 
     <select id="selectBySql" parameterType="java.lang.String" resultType="pwc.taxtech.atms.dpo.CitTbamDto">
-
-
         select
         id as id,
         attribute attribute,

atms-web/src/main/webapp/app/cit/report/cit-report-view/cit-report-view.ctrl.js

@@ -275,6 +275,7 @@
                     break;
                 case enums.formulaDataSourceType.CIT_TBAM:
                     obj.relSql = sourceData.rel_sql;
+                    obj.endingBalance = sourceData.amount;
             }
 
             if (sourceData.type === 0 && sourceData.dataSourceType === enums.cellDataSourceType.RelatedModel) {

atms-web/src/main/webapp/app/cit/report/cit-report-view/cit-report-view.html

@@ -24,7 +24,7 @@
         </cit-report-sheet>
     </div>
     <cell-detail-panel detail="cellDetail" id="cell-detail" source-type="isBSPLSpecial"></cell-detail-panel>
-    <cit-tax-report-cell-detail-modal on-confirm="confirm()" detail="taxCellDetail" id="tax-cell-detail"  active-sheet = "activeSheet"
+    <cit-tax-report-cell-detail-modal on-confirm="confirm()" detail="taxCellDetail"   id="tax-cell-detail"  active-sheet = "activeSheet"
                                   <!--service-type="serviceType"
                                   on-update-data-source="updateCellByManualChange(manualData)"
                                   on-delete-data-source="updateCellByManualSourceDelete(dataSourceId, cellId)"

atms-web/src/main/webapp/app/cit/report/entryList-modal/entryList-modal.ctrl.js

@@ -13,8 +13,9 @@
                 QMYETotalend: ""
             }
         }
-
-        $scope.relObj.logs = [];
+        if($scope.relObj.logs == undefined || $scope.relObj.logs.length == 0){
+            $scope.relObj.logs = [];
+        }
         entityInit();
 
         $scope.dataGridOptions = {
@@ -50,9 +51,13 @@
 
                  $log.debug($scope.selectedItems);*/
                 $scope.doCalcute(selectedItems.selectedRowsData);
-                //更新日志
-                var _data = selectedItems.selectedRowsData;
-                $scope.relObj.logs = commonWebService._index(_data);
+                if(selectedItems.currentDeselectedRowKeys.length == 0){
+                    selectedItems.currentSelectedRowKeys[0].operate = '增'
+                    $scope.relObj.logs.push(selectedItems.currentSelectedRowKeys[0]);
+                }else{
+                    selectedItems.currentDeselectedRowKeys[0].operate = '减';
+                    $scope.relObj.logs.push(selectedItems.currentDeselectedRowKeys[0]);
+                }
 
             },
             allowColumnResizing: true,
@@ -141,10 +146,11 @@
                 }
                 _index++;
             });
-            $scope.entry.JFFSETotal = v1;
-            $scope.entry.DFFSETotal = v2;
-            $scope.entry.QMYETotalFirst = v2 - v1;
-            $scope.entry.QMYETotalend = v1 - v2;
+
+            $scope.entry.JFFSETotal = v1.toFixed(2);
+            $scope.entry.DFFSETotal = v2.toFixed(2);
+            $scope.entry.QMYETotalFirst = (v2 - v1).toFixed(2);
+            $scope.entry.QMYETotalend = (v1 - v2).toFixed(2);
         }
 
     }

atms-web/src/main/webapp/app/cit/report/entryList-modal/entryList-modal.html

@@ -14,7 +14,7 @@
                        <div class="col-sm-4">
                            <div class="row">
                                <div class="menu-log" style="display: inline-block">
-                                   <a class="btn btn-not-important" href="javascript:void(0)" ng-click="showLog()"> <i class="material-icons" style = "margin-bottom: 9px;">description</i><span>日志</span></a>
+                                   <a class="btn btn-not-important"  ng-click="showLog()"> <i class="material-icons" style = "margin-bottom: 9px;">description</i><span>日志</span></a>
                                </div>
                                <div class="button" style="display: inline-block">
                                    <button type="button" class="btn btn-primary"  ng-click="makeSure()">确定</button>
@@ -23,8 +23,6 @@
                            </div>
                        </div>
                    </div>
-
-
             <div class="dx-viewport">
                 <div id="dataSourceGrid" dx-data-grid="dataGridOptions"></div>
             </div>

atms-web/src/main/webapp/app/cit/report/entryList-modal/entryList-modal.js

@@ -8,7 +8,8 @@ function ($log) {
             showLog :'&'
         },
         controller: 'entryListModalController',
-        link: function ($scope, $element, $attr) {
+        link: function (scope, $element, $attr) {
+            //$scope.showLog =  scope.showLog;
         }
     }
 }]);
\ No newline at end of file

atms-web/src/main/webapp/app/cit/report/entryLog-modal/entryLog-modal.ctrl.js

@@ -63,7 +63,7 @@
                     alignment: 'center'
                 },
                 {
-                    dataField: 'description',
+                    dataField: 'operate',
                     caption: $translate.instant('Operate'),
                     alignment: 'center'
                 }

atms-web/src/main/webapp/app/cit/report/entryLog-modal/entryLog-modal.html

-<div class="modal fade" id="entryLogModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
-    <div class="modal-dialog modal-lg" style="width: 1200px;">
-        <div class="modal-content">
-            <div class="modal-header">
+<div>
+    <div class="modal fade" id="entryLogModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" style="z-index: 1100">
+        <div class="modal-dialog modal-lg" style="width: 1200px;">
+            <div class="modal-content">
+                <div class="modal-header">
                 <span class="close" data-dismiss="modal" aria-hidden="true"
                       ng-click="hideCellAttachmentModel()">×</span>
-                <h4 class="modal-title" translate="Remarks"></h4>
-            </div>
-            <div class="dx-viewport">
-                <div id="dataSourceGrid" dx-data-grid="dataGridOptions"></div>
+                    <h4 class="modal-title" translate="Remarks"></h4>
+                </div>
+                <div class="dx-viewport">
+                    <div id="dataSourceGrid" dx-data-grid="dataGridOptions"></div>
+                </div>
             </div>
         </div>
     </div>
-</div>
 </div>
\ No newline at end of file

atms-web/src/main/webapp/app/cit/report/entryLog-modal/entryLog-modal.js

-citModule.directive('entryModal', ['$log',
+citModule.directive('entryLog', ['$log',
 function ($log) {
     return {
         restrict: 'E',

atms-web/src/main/webapp/app/cit/report/tax-report-cell-detail-modal/tax-report-cell-detail-modal.ctrl.js

@@ -228,20 +228,21 @@
             }
             $scope.hidePanel();
             vatCommonService.setProjectStatus(vatSessionService.project.id, vatSessionService.month, status, null, null);
-            if($scope.detail.cellType == enums.formulaDataSourceType.CIT_TBAM){//
+            if ($scope.detail.cellType == enums.formulaDataSourceType.CIT_TBAM) {//
                 [$scope.detail.entryIndex].adjustBack
                 var updateAdjustDto = [];
-                $scope.detail.dataGridSourceBind.forEach(function(e, index){
-                    if(e.adjustBack != undefined && e.adjustBack != null){
+                $scope.detail.dataGridSourceBind.forEach(function (e, index) {
+                    if (e.adjustBack != undefined && e.adjustBack != null) {
                         updateAdjustDto.push({
-                            id : e.id,
-                            adjustAccount :e.adjustBack
+                            id: e.id,
+                            adjustAccount: e.adjustBack
                         });
                     }
                 });
+                updateAdjustDto.push($scope.relObj.logs);
                 cellCommentService.updateAdjust(updateAdjustDto).success(function (res) {
                 }).error(function (error) {
-                    if(error){
+                    if (error) {
                         alert("调整金额数据更新失败");
                     }
                 });
@@ -708,10 +709,9 @@
                 }, 0);
                 $("#dataGridFooterSummary").html($translate.instant('Conclusion')
                     + '    ' + evalVal.formatAmount(precition));
-            }else if($scope.selectedTabIndex === enums.formulaDataSourceType.CIT_TBAM){
+            } else if ($scope.selectedTabIndex === enums.formulaDataSourceType.CIT_TBAM) {
                 evalVal = _.reduce($scope.detail.dataGridSource, function (memo, x) {
-                    debugger;
-                    return memo + x.endBalance;
+                    return memo + x.endingBalance;
                 }, 0);
                 $("#dataGridFooterSummary").html($translate.instant('Conclusion')
                     + '    ' + evalVal.formatAmount(precition));
@@ -1541,19 +1541,19 @@
 //-----------------------------------------------------kevin insert ----------------------------------------------------------------
         //监听穿透返回值（调整后金额）
         $scope.$watch('relObj.checkRadio', function (n, o) {
-            if($scope.detail.entryIndex != undefined){
+            if ($scope.detail.entryIndex != undefined) {
                 $scope.detail.dataGridSourceBind[$scope.detail.entryIndex].adjustBack = n;
                 calculateSum(n);
             }
         });
 
         //重新计算合计值
-        var calculateSum = function(n){
+        var calculateSum = function (n) {
             var precition = 2;
             var evalVal = _.reduce($scope.detail.dataGridSourceBind, function (memo, x) {
-                if(x.accountCode == $scope.relObj.account){
+                if (x.accountCode == $scope.relObj.account) {
                     memo + n;
-                }else{
+                } else {
                     return memo + x.endBalance;
                 }
             }, 0);
@@ -1562,14 +1562,21 @@
                 + '    ' + evalVal.formatAmount(precition));
         }
 
-        $scope.entryShowLog= function(){//显示日志
+        $scope.showLog = function () {//显示日志
+            alert('调用了');
+            //在点击日志前 科目代码下是否有日志
+            cellCommentService.selectEntryLog(entryLogIdByCode).success(function(res){
+                if(res.data){
+                    $scope.relObj.logs = res.data;
+                }
+            }).error();
             $('#entryLogModal').modal('show');
         }
 
         //显示分录信息 同时加载数据
         $scope.loadEntryListDataList = function (e) {
-            $scope.detail.entryIndex  = e.dataIndex;
-            
+            $scope.detail.entryIndex = e.dataIndex;
+            $scope.detail.entryLogIdByCode = e.data.accountCode;
             cellCommentService.loadEntryListDataList(e.data.accountCode).success(function (res) {
                 $scope.relObj.account = e.data.accountCode;
                 if (res.resultMsg == "success") {
@@ -1581,7 +1588,6 @@
             });
         }
 
-
         //设置数据源表格的列
         var getAllDataGridColumns = function () {
             var dataGridColumns;
@@ -1805,6 +1811,7 @@
             });
             addDataSource();
         }
+
         //计算凭证的数值
         function calculateVoucherValue(voucher) {
             return voucher.direction * ((voucher.debitAmount ? voucher.debitAmount : 0) - (voucher.creditAmount ? voucher.creditAmount : 0));
@@ -2265,10 +2272,8 @@
                     }
                 });
 
-
                 $scope.dataGridColumns = getDataGridColumns();
                 getConclusionVal();
-
             }, 500);
         });
         var getBlowGridData = function (data) {
@@ -2277,14 +2282,10 @@
                     $scope.detail.dataGridSourceBind = [res.data[0]];
                 }
             }).error(function (error) {
-
             });
         }
-
-
         //当数据源数量变化是，重新排序数据源
         $scope.$watch('detail.items.length', function (newVal, oldValue) {
-
             if (newVal) {
                 $scope.detail.items = _.sortBy($scope.detail.items, function (item) {
                     if (item.type === enums.formulaDataSourceType.ModelDatasource ||
@@ -2307,7 +2308,6 @@
 
         $scope.$watch('detail.items', function (newVal, oldValue) {
             $timeout(function () {
-
                 $scope.selectedTabIndex = $scope.detail.cellType;
                 $scope.selectedTabId = $scope.detail.cellTypeId;
                 $scope.selectedTypeName = null;
@@ -2319,7 +2319,6 @@
                         $scope.selectedTabIndex = element.type;
                         $scope.selectedTabId = element.id;
                     }
-
                     if (element.type === $scope.detail.cellType && element.id === $scope.selectedTabId &&
                         (element.type !== enums.formulaDataSourceType.OutputInvoice &&
                             element.type !== enums.formulaDataSourceType.Voucher &&
@@ -2362,9 +2361,7 @@
                 }
                 $scope.dataGridColumns = getDataGridColumns();
                 getConclusionVal();
-
                 $scope.isWriteBackUpdate = true;
-
             }, 500);
         });
 

atms-web/src/main/webapp/app/cit/report/tax-report-cell-detail-modal/tax-report-cell-detail-modal.html

@@ -303,7 +303,7 @@
 
     <!--分录弹框-->
     <entry-list-modal id ="entryListId" rel-obj = "relObj" ></entry-list-modal>
-    <entry-Log id ="entryLogId" rel-obj = "relObj"show-log = "entryShowLog" ></entry-Log>
+    <entry-log id ="entryLogId" rel-obj = "relObj" show-log = "showLog" ></entry-log>
 
 </div>
 

atms-web/src/main/webapp/app/cit/report/tax-report-cell-detail-modal/tax-report-cell-detail-modal.js

@@ -6,7 +6,7 @@ function ($log) {
         scope: {
             detail: '=',
             onConfirm: '&',
-            activeSheet : '='
+            activeSheet : '=',
         },
         controller: 'citTaxReportCellDetailModalController',
         link: function ($scope, $element, $attr) {

atms-web/src/main/webapp/app/common/webservices/cellComment.svc.js

@@ -19,6 +19,9 @@ webservices.factory('cellCommentService', ['$http', 'apiConfig', function ($http
         },
         updateAdjust : function (data) {
             return $http.post('/CellComment/updateAdjust', data, apiConfig.createVat());
+        },
+        selectEntryLog : function (code) {
+            return $http.get('/CellComment/selectEntryLog?code=' + code, apiConfig.createVat());
         }
     };
 }]);
\ No newline at end of file